summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@viric.name>2018-07-28 19:25:14 +0200
committerLluís Batlle i Rossell <viric@viric.name>2018-07-28 19:25:14 +0200
commitf54b387b63299245092d9bbf09cb562bac125461 (patch)
tree0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs
parent66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff)
parent0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff)
downloadnixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.gz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.lz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.xz
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.zst
nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.zip
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix210
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-packages.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix4449
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix35
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix2094
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix8
-rw-r--r--pkgs/applications/editors/emacs-modes/org-generated.nix14
-rw-r--r--pkgs/applications/editors/geany/default.nix8
-rw-r--r--pkgs/applications/editors/neovim/default.nix2
-rw-r--r--pkgs/applications/editors/vim/configurable.nix252
-rw-r--r--pkgs/applications/editors/vim/qvim.nix180
-rw-r--r--pkgs/applications/editors/vscode/default.nix5
-rw-r--r--pkgs/applications/graphics/dia/default.nix10
-rw-r--r--pkgs/applications/graphics/glabels/default.nix5
-rw-r--r--pkgs/applications/graphics/inkscape/default.nix10
-rw-r--r--pkgs/applications/misc/alacritty/default.nix8
-rw-r--r--pkgs/applications/misc/mupdf/darwin.patch14
-rw-r--r--pkgs/applications/misc/perkeep/default.nix66
-rw-r--r--pkgs/applications/misc/polybar/default.nix9
-rw-r--r--pkgs/applications/misc/st/default.nix5
-rw-r--r--pkgs/applications/misc/yakuake/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch70
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.nix18
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix794
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix794
-rw-r--r--pkgs/applications/networking/cluster/kubetail/default.nix30
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin/default.nix2
-rw-r--r--pkgs/applications/networking/newsreaders/liferea/default.nix5
-rw-r--r--pkgs/applications/networking/p2p/transmission/default.nix9
-rw-r--r--pkgs/applications/networking/sieve-connect/default.nix48
-rw-r--r--pkgs/applications/office/gnucash/2.4.nix5
-rw-r--r--pkgs/applications/office/gnucash/2.6.nix6
-rw-r--r--pkgs/applications/science/astronomy/openspace/assets.patch100
-rw-r--r--pkgs/applications/science/astronomy/openspace/config.patch49
-rw-r--r--pkgs/applications/science/astronomy/openspace/constexpr.patch91
-rw-r--r--pkgs/applications/science/astronomy/openspace/default.nix89
-rw-r--r--pkgs/applications/science/astronomy/openspace/vrpn.patch13
-rw-r--r--pkgs/applications/science/math/giac/default.nix10
-rw-r--r--pkgs/applications/science/math/pari/default.nix8
-rw-r--r--pkgs/applications/science/math/singular/default.nix38
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix1
-rw-r--r--pkgs/applications/version-management/git-and-tools/tig/default.nix4
-rw-r--r--pkgs/applications/version-management/gitea/default.nix4
-rw-r--r--pkgs/applications/video/handbrake/default.nix9
-rw-r--r--pkgs/applications/video/mpv/default.nix8
-rw-r--r--pkgs/build-support/bintools-wrapper/default.nix2
-rw-r--r--pkgs/build-support/bintools-wrapper/setup-hook.sh8
-rw-r--r--pkgs/build-support/build-maven.nix5
-rw-r--r--pkgs/build-support/docker/default.nix7
-rw-r--r--pkgs/build-support/emacs/melpa.nix25
-rw-r--r--pkgs/build-support/setup-hooks/remove-pytest-cache.sh1
-rw-r--r--pkgs/desktops/gnome-2/platform/GConf/default.nix5
-rw-r--r--pkgs/desktops/xfce/applications/orage.nix5
-rw-r--r--pkgs/desktops/xfce/applications/xfce4-notifyd.nix5
-rw-r--r--pkgs/desktops/xfce/core/thunar-build.nix5
-rw-r--r--pkgs/desktops/xfce/core/thunar-volman.nix5
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix5
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix5
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix6
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix5
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix5
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix6
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix6
-rw-r--r--pkgs/desktops/xfce/thunar-plugins/archive/default.nix5
-rw-r--r--pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix6
-rw-r--r--pkgs/development/beam-modules/default.nix29
-rw-r--r--pkgs/development/compilers/closure/default.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.0.2.nix7
-rw-r--r--pkgs/development/compilers/ghc/8.2.2.nix9
-rw-r--r--pkgs/development/compilers/ghc/8.4.3.nix9
-rw-r--r--pkgs/development/compilers/ghc/8.6.1.nix9
-rw-r--r--pkgs/development/compilers/llvm/4/default.nix31
-rw-r--r--pkgs/development/compilers/llvm/4/llvm.nix2
-rw-r--r--pkgs/development/compilers/llvm/5/default.nix29
-rw-r--r--pkgs/development/compilers/llvm/5/llvm.nix2
-rw-r--r--pkgs/development/compilers/llvm/6/default.nix29
-rw-r--r--pkgs/development/compilers/ocaml/4.07.nix4
-rw-r--r--pkgs/development/compilers/ponyc/default.nix4
-rw-r--r--pkgs/development/coq-modules/category-theory/default.nix12
-rw-r--r--pkgs/development/go-modules/generic/default.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix41
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml44
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix11
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix867
-rw-r--r--pkgs/development/interpreters/elixir/1.7.nix7
-rw-r--r--pkgs/development/interpreters/elixir/generic-builder.nix2
-rw-r--r--pkgs/development/interpreters/php/default.nix407
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/boot.nix4
-rw-r--r--pkgs/development/interpreters/ruby/default.nix5
-rw-r--r--pkgs/development/libraries/at-spi2-atk/default.nix2
-rw-r--r--pkgs/development/libraries/at-spi2-core/default.nix2
-rw-r--r--pkgs/development/libraries/audio/libmysofa/default.nix26
-rw-r--r--pkgs/development/libraries/boost/1.67.nix8
-rw-r--r--pkgs/development/libraries/dbxml/cxx11.patch59
-rw-r--r--pkgs/development/libraries/dbxml/default.nix38
-rw-r--r--pkgs/development/libraries/dbxml/incorrect-optimization.patch34
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix4
-rw-r--r--pkgs/development/libraries/fribidi/default.nix9
-rw-r--r--pkgs/development/libraries/gcc/libgcc/default.nix152
-rw-r--r--pkgs/development/libraries/gcc/libstdc++/5.nix (renamed from pkgs/development/libraries/libstdc++5/default.nix)0
-rw-r--r--pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch (renamed from pkgs/development/libraries/libstdc++5/no-sys-dirs.patch)0
-rw-r--r--pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch (renamed from pkgs/development/libraries/libstdc++5/struct-ucontext.patch)0
-rw-r--r--pkgs/development/libraries/gvfs/default.nix10
-rw-r--r--pkgs/development/libraries/ilmbase/default.nix5
-rw-r--r--pkgs/development/libraries/kerberos/krb5.nix6
-rw-r--r--pkgs/development/libraries/libcommuni/default.nix1
-rw-r--r--pkgs/development/libraries/libffi/default.nix10
-rw-r--r--pkgs/development/libraries/libfilezilla/default.nix4
-rw-r--r--pkgs/development/libraries/libnice/default.nix2
-rw-r--r--pkgs/development/libraries/librdf/default.nix9
-rw-r--r--pkgs/development/libraries/librdf/rasqal.nix6
-rw-r--r--pkgs/development/libraries/libtensorflow/default.nix57
-rw-r--r--pkgs/development/libraries/libxml2/default.nix17
-rw-r--r--pkgs/development/libraries/mdds/default.nix4
-rw-r--r--pkgs/development/libraries/mesa/default.nix2
-rw-r--r--pkgs/development/libraries/mesa/missing-include.patch11
-rw-r--r--pkgs/development/libraries/mesa/missing-includes.patch55
-rw-r--r--pkgs/development/libraries/neon/0.29.nix5
-rw-r--r--pkgs/development/libraries/neon/default.nix5
-rw-r--r--pkgs/development/libraries/newt/default.nix7
-rw-r--r--pkgs/development/libraries/nlohmann_json/default.nix13
-rw-r--r--pkgs/development/libraries/npth/default.nix4
-rw-r--r--pkgs/development/libraries/opencv/3.x.nix48
-rw-r--r--pkgs/development/libraries/opencv/fix-dnn.patch13
-rw-r--r--pkgs/development/libraries/openssl/default.nix8
-rw-r--r--pkgs/development/libraries/pcl/default.nix11
-rw-r--r--pkgs/development/libraries/qt-4.x/4.8/default.nix114
-rw-r--r--pkgs/development/libraries/skalibs/default.nix20
-rw-r--r--pkgs/development/libraries/soil/default.nix28
-rw-r--r--pkgs/development/libraries/zeromq/4.x.nix8
-rw-r--r--pkgs/development/ocaml-modules/janestreet/default.nix3
-rw-r--r--pkgs/development/ocaml-modules/ppx_gen_rec/default.nix30
-rw-r--r--pkgs/development/python-modules/black/default.nix19
-rw-r--r--pkgs/development/python-modules/exchangelib/default.nix32
-rw-r--r--pkgs/development/python-modules/exchangelib/skip_failing_test.patch18
-rw-r--r--pkgs/development/python-modules/hypothesis/default.nix2
-rw-r--r--pkgs/development/python-modules/pykerberos/default.nix22
-rw-r--r--pkgs/development/python-modules/pyserial/default.nix2
-rw-r--r--pkgs/development/python-modules/pytest-flake8/default.nix2
-rw-r--r--pkgs/development/python-modules/pytest/default.nix7
-rw-r--r--pkgs/development/python-modules/requests-kerberos/default.nix27
-rw-r--r--pkgs/development/python-modules/requests-kerberos/fix_setup.patch9
-rw-r--r--pkgs/development/python-modules/rfc7464/default.nix19
-rw-r--r--pkgs/development/python-modules/sabyenc/default.nix22
-rw-r--r--pkgs/development/python-modules/salmon-mail/default.nix4
-rw-r--r--pkgs/development/python-modules/wxPython/4.0.nix41
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix11
-rw-r--r--pkgs/development/tools/analysis/flow/default.nix6
-rw-r--r--pkgs/development/tools/build-managers/bazel/default.nix14
-rw-r--r--pkgs/development/tools/build-managers/meson/default.nix4
-rw-r--r--pkgs/development/tools/cloudfoundry-cli/default.nix11
-rw-r--r--pkgs/development/tools/dep/default.nix6
-rw-r--r--pkgs/development/tools/kustomize/default.nix28
-rw-r--r--pkgs/development/tools/misc/circleci-cli/default.nix6
-rw-r--r--pkgs/development/tools/misc/elfutils/default.nix70
-rw-r--r--pkgs/development/tools/misc/kibana/6.x.nix47
-rw-r--r--pkgs/development/tools/misc/ycmd/default.nix8
-rw-r--r--pkgs/development/tools/parsing/flex/2.5.35.nix10
-rw-r--r--pkgs/development/tools/parsing/flex/2.6.1.nix21
-rw-r--r--pkgs/development/tools/pet/default.nix25
-rw-r--r--pkgs/development/tools/pet/deps.nix155
-rw-r--r--pkgs/development/tools/rshell/default.nix20
-rw-r--r--pkgs/development/tools/rubocop/Gemfile.lock14
-rw-r--r--pkgs/development/tools/rubocop/gemset.nix26
-rw-r--r--pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch23
-rw-r--r--pkgs/development/tools/rust/rustup/default.nix12
-rw-r--r--pkgs/development/tools/skopeo/default.nix6
-rw-r--r--pkgs/games/arena/default.nix74
-rw-r--r--pkgs/games/minecraft/default.nix49
-rw-r--r--pkgs/games/prboom/default.nix33
-rw-r--r--pkgs/games/runelite/default.nix53
-rw-r--r--pkgs/games/scummvm/default.nix16
-rw-r--r--pkgs/games/stockfish/default.nix9
-rw-r--r--pkgs/misc/logging/beats/6.x.nix2
-rw-r--r--pkgs/misc/vim-plugins/default.nix267
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names10
-rw-r--r--pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort4
-rw-r--r--pkgs/misc/vscode-extensions/python/default.nix4
-rw-r--r--pkgs/os-specific/darwin/skhd/default.nix6
-rw-r--r--pkgs/os-specific/gnu/hurd/default.nix3
-rw-r--r--pkgs/os-specific/gnu/mig/default.nix12
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix4
-rw-r--r--pkgs/os-specific/linux/fuse/default.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.14.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.17.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.4.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.9.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix24
-rw-r--r--pkgs/os-specific/linux/kmod/default.nix2
-rw-r--r--pkgs/os-specific/linux/s6-linux-utils/default.nix20
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix18
-rw-r--r--pkgs/os-specific/windows/jom/default.nix12
-rw-r--r--pkgs/servers/atlassian/jira.nix6
-rw-r--r--pkgs/servers/dns/bind/default.nix4
-rw-r--r--pkgs/servers/foundationdb/default.nix11
-rw-r--r--pkgs/servers/matrix-synapse/default.nix8
-rw-r--r--pkgs/servers/monitoring/grafana/default.nix6
-rw-r--r--pkgs/servers/sabnzbd/default.nix2
-rw-r--r--pkgs/servers/search/elasticsearch/6.x.nix36
-rw-r--r--pkgs/servers/traefik/default.nix4
-rw-r--r--pkgs/servers/x11/xorg/default.nix1
-rw-r--r--pkgs/stdenv/adapters.nix38
-rw-r--r--pkgs/stdenv/cross/default.nix21
-rw-r--r--pkgs/stdenv/darwin/default.nix49
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix2
-rw-r--r--pkgs/stdenv/generic/setup.sh4
-rw-r--r--pkgs/tools/admin/amazon-ecr-credential-helper/default.nix23
-rw-r--r--pkgs/tools/admin/azure-cli/default.nix0
-rw-r--r--pkgs/tools/archivers/sharutils/default.nix4
-rw-r--r--pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch63
-rw-r--r--pkgs/tools/bootloaders/refind/default.nix4
-rw-r--r--pkgs/tools/filesystems/android-file-transfer/default.nix27
-rw-r--r--pkgs/tools/filesystems/simg2img/default.nix25
-rw-r--r--pkgs/tools/graphics/appleseed/default.nix14
-rw-r--r--pkgs/tools/graphics/yaxg/default.nix38
-rw-r--r--pkgs/tools/misc/eot-utilities/default.nix2
-rw-r--r--pkgs/tools/misc/execline/default.nix28
-rw-r--r--pkgs/tools/misc/fortune/default.nix13
-rw-r--r--pkgs/tools/misc/fzf/default.nix4
-rw-r--r--pkgs/tools/misc/logstash/6.x.nix19
-rw-r--r--pkgs/tools/misc/minicom/default.nix6
-rw-r--r--pkgs/tools/misc/s6-portable-utils/default.nix19
-rw-r--r--pkgs/tools/networking/cntlm/default.nix10
-rw-r--r--pkgs/tools/networking/curl/7_59.nix15
-rw-r--r--pkgs/tools/networking/curl/default.nix21
-rw-r--r--pkgs/tools/networking/network-manager/vpnc.nix8
-rw-r--r--pkgs/tools/networking/s6-dns/default.nix28
-rw-r--r--pkgs/tools/networking/s6-networking/default.nix70
-rw-r--r--pkgs/tools/security/cfssl/default.nix6
-rw-r--r--pkgs/tools/security/passff-host/default.nix36
-rw-r--r--pkgs/tools/security/tor/default.nix2
-rw-r--r--pkgs/tools/security/vulnix/default.nix4
-rw-r--r--pkgs/tools/system/bfs/default.nix2
-rw-r--r--pkgs/tools/system/bfs/tests.patch10
-rw-r--r--pkgs/tools/system/gotop/default.nix2
-rw-r--r--pkgs/tools/system/pciutils/default.nix14
-rw-r--r--pkgs/tools/system/s6-rc/default.nix39
-rw-r--r--pkgs/tools/system/s6/default.nix37
-rw-r--r--pkgs/top-level/aliases.nix5
-rw-r--r--pkgs/top-level/all-packages.nix133
-rw-r--r--pkgs/top-level/beam-packages.nix2
-rw-r--r--pkgs/top-level/emacs-packages.nix17
-rw-r--r--pkgs/top-level/metrics.nix2
-rw-r--r--pkgs/top-level/ocaml-packages.nix4
-rw-r--r--pkgs/top-level/python-packages.nix22
249 files changed, 11012 insertions, 3507 deletions
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8b03d93d183..84371d15249 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -555,12 +555,12 @@ rec {
 
   spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.5";
+    version = "3.1.6";
 
     src = fetchzip {
       stripRoot = false;
       url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
-      sha256 = "0fxdirz6ik9rqykm2lcr720apsaqgngr4c7q793rjb9b3bn30c85";
+      sha256 = "1qsams12n64slp00nfc9v943sy9bzffzm7anqqaz2hjw64iia7fh";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9f1ee111c25..146e4128f7d 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -3,6 +3,7 @@
     ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ace-window";
+        ename = "ace-window";
         version = "0.9.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el";
@@ -17,6 +18,7 @@
     ack = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ack";
+        ename = "ack";
         version = "1.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ack-1.5.tar";
@@ -36,6 +38,7 @@
                             , wisi }:
       elpaBuild {
         pname = "ada-mode";
+        ename = "ada-mode";
         version = "5.3.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar";
@@ -50,6 +53,7 @@
     ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ada-ref-man";
+        ename = "ada-ref-man";
         version = "2012.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ada-ref-man-2012.3.tar";
@@ -64,6 +68,7 @@
     adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "adaptive-wrap";
+        ename = "adaptive-wrap";
         version = "0.5.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el";
@@ -78,6 +83,7 @@
     adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "adjust-parens";
+        ename = "adjust-parens";
         version = "3.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/adjust-parens-3.0.tar";
@@ -96,6 +102,7 @@
                                      , lib }:
       elpaBuild {
         pname = "aggressive-indent";
+        ename = "aggressive-indent";
         version = "1.8.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el";
@@ -110,6 +117,7 @@
     ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ahungry-theme";
+        ename = "ahungry-theme";
         version = "1.10.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
@@ -124,6 +132,7 @@
     all = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "all";
+        ename = "all";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/all-1.0.el";
@@ -138,6 +147,7 @@
     ampc = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ampc";
+        ename = "ampc";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ampc-0.2.el";
@@ -152,6 +162,7 @@
     arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "arbitools";
+        ename = "arbitools";
         version = "0.95";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/arbitools-0.95.el";
@@ -166,6 +177,7 @@
     ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ascii-art-to-unicode";
+        ename = "ascii-art-to-unicode";
         version = "1.12";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.12.el";
@@ -180,6 +192,7 @@
     async = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "async";
+        ename = "async";
         version = "1.9.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/async-1.9.2.tar";
@@ -194,6 +207,7 @@
     auctex = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "auctex";
+        ename = "auctex";
         version = "12.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar";
@@ -208,6 +222,7 @@
     aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "aumix-mode";
+        ename = "aumix-mode";
         version = "7";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/aumix-mode-7.el";
@@ -222,6 +237,7 @@
     auto-correct = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "auto-correct";
+        ename = "auto-correct";
         version = "1.1.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.el";
@@ -236,6 +252,7 @@
     auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "auto-overlays";
+        ename = "auto-overlays";
         version = "0.10.9";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
@@ -250,6 +267,7 @@
     avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "avy";
+        ename = "avy";
         version = "0.4.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/avy-0.4.0.tar";
@@ -264,6 +282,7 @@
     bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "bbdb";
+        ename = "bbdb";
         version = "3.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
@@ -278,6 +297,7 @@
     beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }:
       elpaBuild {
         pname = "beacon";
+        ename = "beacon";
         version = "1.3.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/beacon-1.3.3.el";
@@ -292,6 +312,7 @@
     bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
       elpaBuild {
         pname = "bug-hunter";
+        ename = "bug-hunter";
         version = "1.3.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el";
@@ -306,6 +327,7 @@
     caps-lock = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "caps-lock";
+        ename = "caps-lock";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/caps-lock-1.0.el";
@@ -320,6 +342,7 @@
     captain = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "captain";
+        ename = "captain";
         version = "1.0.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/captain-1.0.3.el";
@@ -334,6 +357,7 @@
     chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "chess";
+        ename = "chess";
         version = "2.0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/chess-2.0.4.tar";
@@ -348,6 +372,7 @@
     cl-generic = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "cl-generic";
+        ename = "cl-generic";
         version = "0.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/cl-generic-0.3.el";
@@ -362,6 +387,7 @@
     cl-lib = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "cl-lib";
+        ename = "cl-lib";
         version = "0.6.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el";
@@ -376,6 +402,7 @@
     cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "cl-print";
+        ename = "cl-print";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/cl-print-1.0.el";
@@ -390,6 +417,7 @@
     cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "cobol-mode";
+        ename = "cobol-mode";
         version = "1.0.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el";
@@ -404,6 +432,7 @@
     coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "coffee-mode";
+        ename = "coffee-mode";
         version = "0.4.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
@@ -418,6 +447,7 @@
     compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "compact-docstrings";
+        ename = "compact-docstrings";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/compact-docstrings-0.1.el";
@@ -432,6 +462,7 @@
     company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "company";
+        ename = "company";
         version = "0.9.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/company-0.9.6.tar";
@@ -446,6 +477,7 @@
     company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "company-ebdb";
+        ename = "company-ebdb";
         version = "1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/company-ebdb-1.el";
@@ -464,6 +496,7 @@
                                 , math-symbol-lists }:
       elpaBuild {
         pname = "company-math";
+        ename = "company-math";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/company-math-1.1.tar";
@@ -482,6 +515,7 @@
                                       , lib }:
       elpaBuild {
         pname = "company-statistics";
+        ename = "company-statistics";
         version = "0.2.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar";
@@ -496,6 +530,7 @@
     context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "context-coloring";
+        ename = "context-coloring";
         version = "8.1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
@@ -510,6 +545,7 @@
     counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }:
       elpaBuild {
         pname = "counsel-ebdb";
+        ename = "counsel-ebdb";
         version = "1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el";
@@ -524,6 +560,7 @@
     crisp = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "crisp";
+        ename = "crisp";
         version = "1.3.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/crisp-1.3.4.el";
@@ -538,6 +575,7 @@
     csv-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "csv-mode";
+        ename = "csv-mode";
         version = "1.7";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
@@ -552,6 +590,7 @@
     cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "cycle-quotes";
+        ename = "cycle-quotes";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar";
@@ -566,6 +605,7 @@
     darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "darkroom";
+        ename = "darkroom";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/darkroom-0.1.el";
@@ -580,6 +620,7 @@
     dash = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "dash";
+        ename = "dash";
         version = "2.12.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dash-2.12.0.tar";
@@ -594,6 +635,7 @@
     dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "dbus-codegen";
+        ename = "dbus-codegen";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.el";
@@ -612,6 +654,7 @@
                            , soap-client }:
       elpaBuild {
         pname = "debbugs";
+        ename = "debbugs";
         version = "0.15";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/debbugs-0.15.tar";
@@ -626,6 +669,7 @@
     delight = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "delight";
+        ename = "delight";
         version = "1.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/delight-1.5.el";
@@ -640,6 +684,7 @@
     dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
       elpaBuild {
         pname = "dict-tree";
+        ename = "dict-tree";
         version = "0.14";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dict-tree-0.14.el";
@@ -654,6 +699,7 @@
     diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "diff-hl";
+        ename = "diff-hl";
         version = "1.8.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar";
@@ -668,6 +714,7 @@
     diffview = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "diffview";
+        ename = "diffview";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/diffview-1.0.el";
@@ -682,6 +729,7 @@
     dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "dired-du";
+        ename = "dired-du";
         version = "0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dired-du-0.5.tar";
@@ -696,6 +744,7 @@
     dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "dismal";
+        ename = "dismal";
         version = "1.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dismal-1.5.tar";
@@ -710,6 +759,7 @@
     djvu = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "djvu";
+        ename = "djvu";
         version = "0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/djvu-0.5.el";
@@ -724,6 +774,7 @@
     docbook = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "docbook";
+        ename = "docbook";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/docbook-0.1.el";
@@ -738,6 +789,7 @@
     dts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "dts-mode";
+        ename = "dts-mode";
         version = "0.1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/dts-mode-0.1.0.el";
@@ -752,6 +804,7 @@
     easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "easy-kill";
+        ename = "easy-kill";
         version = "0.9.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
@@ -766,6 +819,7 @@
     ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
       elpaBuild {
         pname = "ebdb";
+        ename = "ebdb";
         version = "0.5.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ebdb-0.5.4.tar";
@@ -780,6 +834,7 @@
     ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
       elpaBuild {
         pname = "ebdb-gnorb";
+        ename = "ebdb-gnorb";
         version = "1.0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el";
@@ -794,6 +849,7 @@
     ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
       elpaBuild {
         pname = "ebdb-i18n-chn";
+        ename = "ebdb-i18n-chn";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el";
@@ -808,6 +864,7 @@
     ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ediprolog";
+        ename = "ediprolog";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ediprolog-1.2.el";
@@ -822,6 +879,7 @@
     eglot = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
       elpaBuild {
         pname = "eglot";
+        ename = "eglot";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/eglot-1.1.tar";
@@ -841,10 +899,11 @@
                              , stream }:
       elpaBuild {
         pname = "el-search";
-        version = "1.7.2";
+        ename = "el-search";
+        version = "1.7.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.7.2.tar";
-          sha256 = "17frf7alnwvjd0dn0xd7g95nfq8nb2x9lqady0bv3ngr7c2ls5r6";
+          url = "https://elpa.gnu.org/packages/el-search-1.7.3.tar";
+          sha256 = "0nxjgi027mjjn53nm9ara4nyr7kyqjawsmfaygsxqjv0mbykjmd1";
         };
         packageRequires = [ cl-print emacs stream ];
         meta = {
@@ -855,6 +914,7 @@
     eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "eldoc-eval";
+        ename = "eldoc-eval";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el";
@@ -869,6 +929,7 @@
     electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "electric-spacing";
+        ename = "electric-spacing";
         version = "5.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el";
@@ -883,6 +944,7 @@
     enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "enwc";
+        ename = "enwc";
         version = "2.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/enwc-2.0.tar";
@@ -897,6 +959,7 @@
     epoch-view = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "epoch-view";
+        ename = "epoch-view";
         version = "0.0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
@@ -915,6 +978,7 @@
                                   , undo-tree }:
       elpaBuild {
         pname = "ergoemacs-mode";
+        ename = "ergoemacs-mode";
         version = "5.14.7.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar";
@@ -935,6 +999,7 @@
                                , url-http-ntlm }:
       elpaBuild {
         pname = "excorporate";
+        ename = "excorporate";
         version = "0.7.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/excorporate-0.7.6.tar";
@@ -949,10 +1014,11 @@
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
       elpaBuild {
         pname = "exwm";
-        version = "0.18";
+        ename = "exwm";
+        version = "0.19";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.18.tar";
-          sha256 = "1shz5bf4v4gg3arjaaldics5qkg3aiiaf3ngys8lb6qyxhcpvh6q";
+          url = "https://elpa.gnu.org/packages/exwm-0.19.tar";
+          sha256 = "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -963,6 +1029,7 @@
     f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "f90-interface-browser";
+        ename = "f90-interface-browser";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
@@ -977,6 +1044,7 @@
     filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "filladapt";
+        ename = "filladapt";
         version = "2.12.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/filladapt-2.12.2.el";
@@ -991,6 +1059,7 @@
     flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "flylisp";
+        ename = "flylisp";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/flylisp-0.2.el";
@@ -1005,6 +1074,7 @@
     frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "frame-tabs";
+        ename = "frame-tabs";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/frame-tabs-1.1.el";
@@ -1019,6 +1089,7 @@
     fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "fsm";
+        ename = "fsm";
         version = "0.2.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/fsm-0.2.1.el";
@@ -1033,6 +1104,7 @@
     ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ggtags";
+        ename = "ggtags";
         version = "0.8.12";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el";
@@ -1047,6 +1119,7 @@
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "gited";
+        ename = "gited";
         version = "0.5.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/gited-0.5.3.tar";
@@ -1061,6 +1134,7 @@
     gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "gle-mode";
+        ename = "gle-mode";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/gle-mode-1.1.el";
@@ -1075,6 +1149,7 @@
     gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "gnome-c-style";
+        ename = "gnome-c-style";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
@@ -1089,6 +1164,7 @@
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "gnorb";
+        ename = "gnorb";
         version = "1.5.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/gnorb-1.5.5.tar";
@@ -1108,6 +1184,7 @@
                          , xpm }:
       elpaBuild {
         pname = "gnugo";
+        ename = "gnugo";
         version = "3.1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar";
@@ -1122,6 +1199,7 @@
     heap = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "heap";
+        ename = "heap";
         version = "0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/heap-0.5.el";
@@ -1136,6 +1214,7 @@
     helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }:
       elpaBuild {
         pname = "helm-ebdb";
+        ename = "helm-ebdb";
         version = "1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/helm-ebdb-1.el";
@@ -1152,6 +1231,7 @@
                                               , lib }:
       elpaBuild {
         pname = "highlight-escape-sequences";
+        ename = "highlight-escape-sequences";
         version = "0.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el";
@@ -1166,6 +1246,7 @@
     hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "hook-helpers";
+        ename = "hook-helpers";
         version = "1.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
@@ -1180,6 +1261,7 @@
     html5-schema = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "html5-schema";
+        ename = "html5-schema";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
@@ -1194,6 +1276,7 @@
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "hydra";
+        ename = "hydra";
         version = "0.14.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
@@ -1208,6 +1291,7 @@
     hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "hyperbole";
+        ename = "hyperbole";
         version = "7.0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar";
@@ -1222,6 +1306,7 @@
     ioccur = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ioccur";
+        ename = "ioccur";
         version = "2.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ioccur-2.4.el";
@@ -1236,6 +1321,7 @@
     iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "iterators";
+        ename = "iterators";
         version = "0.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/iterators-0.1.1.el";
@@ -1250,6 +1336,7 @@
     ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ivy";
+        ename = "ivy";
         version = "0.10.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar";
@@ -1264,6 +1351,7 @@
     javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "javaimp";
+        ename = "javaimp";
         version = "0.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/javaimp-0.6.tar";
@@ -1278,6 +1366,7 @@
     jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "jgraph-mode";
+        ename = "jgraph-mode";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.el";
@@ -1292,6 +1381,7 @@
     js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "js2-mode";
+        ename = "js2-mode";
         version = "20180301";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar";
@@ -1306,6 +1396,7 @@
     json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "json-mode";
+        ename = "json-mode";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/json-mode-0.1.el";
@@ -1320,6 +1411,7 @@
     jsonrpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "jsonrpc";
+        ename = "jsonrpc";
         version = "1.0.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/jsonrpc-1.0.0.el";
@@ -1334,6 +1426,7 @@
     jumpc = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "jumpc";
+        ename = "jumpc";
         version = "3.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/jumpc-3.0.el";
@@ -1348,6 +1441,7 @@
     kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "kmb";
+        ename = "kmb";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/kmb-0.1.el";
@@ -1362,6 +1456,7 @@
     landmark = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "landmark";
+        ename = "landmark";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/landmark-1.0.el";
@@ -1376,6 +1471,7 @@
     let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "let-alist";
+        ename = "let-alist";
         version = "1.0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el";
@@ -1390,6 +1486,7 @@
     lex = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "lex";
+        ename = "lex";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/lex-1.1.tar";
@@ -1404,6 +1501,7 @@
     lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "lmc";
+        ename = "lmc";
         version = "1.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/lmc-1.4.el";
@@ -1418,6 +1516,7 @@
     load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "load-dir";
+        ename = "load-dir";
         version = "0.0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el";
@@ -1432,6 +1531,7 @@
     load-relative = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "load-relative";
+        ename = "load-relative";
         version = "1.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/load-relative-1.3.el";
@@ -1446,6 +1546,7 @@
     loc-changes = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "loc-changes";
+        ename = "loc-changes";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/loc-changes-1.2.el";
@@ -1460,6 +1561,7 @@
     loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "loccur";
+        ename = "loccur";
         version = "1.2.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/loccur-1.2.3.el";
@@ -1474,6 +1576,7 @@
     markchars = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "markchars";
+        ename = "markchars";
         version = "0.2.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/markchars-0.2.0.el";
@@ -1488,6 +1591,7 @@
     math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "math-symbol-lists";
+        ename = "math-symbol-lists";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
@@ -1502,6 +1606,7 @@
     memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "memory-usage";
+        ename = "memory-usage";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/memory-usage-0.2.el";
@@ -1516,6 +1621,7 @@
     metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "metar";
+        ename = "metar";
         version = "0.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/metar-0.3.el";
@@ -1530,6 +1636,7 @@
     midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "midi-kbd";
+        ename = "midi-kbd";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/midi-kbd-0.2.el";
@@ -1544,6 +1651,7 @@
     mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "mines";
+        ename = "mines";
         version = "1.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/mines-1.6.tar";
@@ -1558,6 +1666,7 @@
     minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "minibuffer-line";
+        ename = "minibuffer-line";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.el";
@@ -1572,6 +1681,7 @@
     minimap = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "minimap";
+        ename = "minimap";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/minimap-1.2.el";
@@ -1586,6 +1696,7 @@
     mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "mmm-mode";
+        ename = "mmm-mode";
         version = "0.5.7";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar";
@@ -1600,6 +1711,7 @@
     multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "multishell";
+        ename = "multishell";
         version = "1.1.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar";
@@ -1614,6 +1726,7 @@
     muse = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "muse";
+        ename = "muse";
         version = "3.20.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/muse-3.20.2.tar";
@@ -1628,6 +1741,7 @@
     myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "myers";
+        ename = "myers";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/myers-0.1.el";
@@ -1642,6 +1756,7 @@
     nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "nameless";
+        ename = "nameless";
         version = "1.0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/nameless-1.0.2.el";
@@ -1656,6 +1771,7 @@
     names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "names";
+        ename = "names";
         version = "20151201.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
@@ -1674,6 +1790,7 @@
                               , lib }:
       elpaBuild {
         pname = "nhexl-mode";
+        ename = "nhexl-mode";
         version = "0.9";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/nhexl-mode-0.9.el";
@@ -1688,6 +1805,7 @@
     nlinum = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "nlinum";
+        ename = "nlinum";
         version = "1.8.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/nlinum-1.8.1.el";
@@ -1702,6 +1820,7 @@
     notes-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "notes-mode";
+        ename = "notes-mode";
         version = "1.30";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/notes-mode-1.30.tar";
@@ -1716,6 +1835,7 @@
     ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ntlm";
+        ename = "ntlm";
         version = "2.1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ntlm-2.1.0.el";
@@ -1730,6 +1850,7 @@
     num3-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "num3-mode";
+        ename = "num3-mode";
         version = "1.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/num3-mode-1.3.el";
@@ -1744,6 +1865,7 @@
     oauth2 = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "oauth2";
+        ename = "oauth2";
         version = "0.11";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/oauth2-0.11.el";
@@ -1758,6 +1880,7 @@
     omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "omn-mode";
+        ename = "omn-mode";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/omn-mode-1.2.el";
@@ -1772,6 +1895,7 @@
     on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "on-screen";
+        ename = "on-screen";
         version = "1.3.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/on-screen-1.3.2.el";
@@ -1786,6 +1910,7 @@
     org = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "org";
+        ename = "org";
         version = "9.1.13";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/org-9.1.13.tar";
@@ -1800,6 +1925,7 @@
     orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "orgalist";
+        ename = "orgalist";
         version = "1.8";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/orgalist-1.8.el";
@@ -1814,6 +1940,7 @@
     osc = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "osc";
+        ename = "osc";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/osc-0.1.el";
@@ -1828,6 +1955,7 @@
     other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "other-frame-window";
+        ename = "other-frame-window";
         version = "1.0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el";
@@ -1842,6 +1970,7 @@
     pabbrev = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "pabbrev";
+        ename = "pabbrev";
         version = "4.2.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el";
@@ -1856,6 +1985,7 @@
     paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "paced";
+        ename = "paced";
         version = "1.1.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
@@ -1870,6 +2000,7 @@
     parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "parsec";
+        ename = "parsec";
         version = "0.1.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
@@ -1884,6 +2015,7 @@
     pinentry = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "pinentry";
+        ename = "pinentry";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/pinentry-0.1.el";
@@ -1898,6 +2030,7 @@
     poker = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "poker";
+        ename = "poker";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/poker-0.2.el";
@@ -1912,6 +2045,7 @@
     posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "posframe";
+        ename = "posframe";
         version = "0.3.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/posframe-0.3.0.el";
@@ -1926,6 +2060,7 @@
     psgml = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "psgml";
+        ename = "psgml";
         version = "1.3.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar";
@@ -1940,6 +2075,7 @@
     python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "python";
+        ename = "python";
         version = "0.26.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/python-0.26.1.el";
@@ -1954,6 +2090,7 @@
     quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "quarter-plane";
+        ename = "quarter-plane";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/quarter-plane-0.1.el";
@@ -1968,6 +2105,7 @@
     queue = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "queue";
+        ename = "queue";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/queue-0.2.el";
@@ -1982,6 +2120,7 @@
     rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rainbow-mode";
+        ename = "rainbow-mode";
         version = "1.0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.1.el";
@@ -1996,6 +2135,7 @@
     rbit = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rbit";
+        ename = "rbit";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rbit-0.1.el";
@@ -2010,6 +2150,7 @@
     rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rcirc-color";
+        ename = "rcirc-color";
         version = "0.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el";
@@ -2024,6 +2165,7 @@
     rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rcirc-menu";
+        ename = "rcirc-menu";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el";
@@ -2045,6 +2187,7 @@
                            , test-simple }:
       elpaBuild {
         pname = "realgud";
+        ename = "realgud";
         version = "1.4.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/realgud-1.4.5.tar";
@@ -2065,6 +2208,7 @@
     register-list = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "register-list";
+        ename = "register-list";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/register-list-0.1.el";
@@ -2079,6 +2223,7 @@
     rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rich-minority";
+        ename = "rich-minority";
         version = "1.0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el";
@@ -2093,6 +2238,7 @@
     rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "rnc-mode";
+        ename = "rnc-mode";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el";
@@ -2112,6 +2258,7 @@
                          , lib }:
       elpaBuild {
         pname = "rudel";
+        ename = "rudel";
         version = "0.3.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar";
@@ -2126,6 +2273,7 @@
     scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "scroll-restore";
+        ename = "scroll-restore";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/scroll-restore-1.0.el";
@@ -2140,6 +2288,7 @@
     sed-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "sed-mode";
+        ename = "sed-mode";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sed-mode-1.0.el";
@@ -2154,6 +2303,7 @@
     seq = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "seq";
+        ename = "seq";
         version = "2.20";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/seq-2.20.tar";
@@ -2168,6 +2318,7 @@
     shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "shen-mode";
+        ename = "shen-mode";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar";
@@ -2182,6 +2333,7 @@
     sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "sisu-mode";
+        ename = "sisu-mode";
         version = "7.1.8";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.el";
@@ -2196,6 +2348,7 @@
     smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "smart-yank";
+        ename = "smart-yank";
         version = "0.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.el";
@@ -2210,6 +2363,7 @@
     sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "sml-mode";
+        ename = "sml-mode";
         version = "6.8";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sml-mode-6.8.el";
@@ -2224,6 +2378,7 @@
     soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "soap-client";
+        ename = "soap-client";
         version = "3.1.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/soap-client-3.1.4.tar";
@@ -2238,6 +2393,7 @@
     sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "sokoban";
+        ename = "sokoban";
         version = "1.4.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar";
@@ -2252,6 +2408,7 @@
     sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "sotlisp";
+        ename = "sotlisp";
         version = "1.6.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.el";
@@ -2266,6 +2423,7 @@
     spinner = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "spinner";
+        ename = "spinner";
         version = "1.7.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
@@ -2280,6 +2438,7 @@
     sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "sql-indent";
+        ename = "sql-indent";
         version = "1.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/sql-indent-1.2.tar";
@@ -2294,6 +2453,7 @@
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "stream";
+        ename = "stream";
         version = "2.2.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/stream-2.2.4.tar";
@@ -2308,6 +2468,7 @@
     svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "svg";
+        ename = "svg";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/svg-0.1.el";
@@ -2322,6 +2483,7 @@
     svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
       elpaBuild {
         pname = "svg-clock";
+        ename = "svg-clock";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/svg-clock-1.0.el";
@@ -2336,6 +2498,7 @@
     tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
       elpaBuild {
         pname = "tNFA";
+        ename = "tNFA";
         version = "0.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el";
@@ -2350,6 +2513,7 @@
     temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "temp-buffer-browse";
+        ename = "temp-buffer-browse";
         version = "1.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.el";
@@ -2364,6 +2528,7 @@
     test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "test-simple";
+        ename = "test-simple";
         version = "1.3.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el";
@@ -2378,6 +2543,7 @@
     timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "timerfunctions";
+        ename = "timerfunctions";
         version = "1.4.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
@@ -2392,6 +2558,7 @@
     tiny = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "tiny";
+        ename = "tiny";
         version = "0.2.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar";
@@ -2406,6 +2573,7 @@
     tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "tramp-theme";
+        ename = "tramp-theme";
         version = "0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el";
@@ -2420,6 +2588,7 @@
     transcribe = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "transcribe";
+        ename = "transcribe";
         version = "1.5.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/transcribe-1.5.2.el";
@@ -2434,6 +2603,7 @@
     trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
       elpaBuild {
         pname = "trie";
+        ename = "trie";
         version = "0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/trie-0.4.el";
@@ -2448,6 +2618,7 @@
     undo-tree = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "undo-tree";
+        ename = "undo-tree";
         version = "0.6.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/undo-tree-0.6.5.el";
@@ -2462,6 +2633,7 @@
     uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "uni-confusables";
+        ename = "uni-confusables";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/uni-confusables-0.1.tar";
@@ -2480,6 +2652,7 @@
                                  , ntlm ? null }:
       elpaBuild {
         pname = "url-http-ntlm";
+        ename = "url-http-ntlm";
         version = "2.0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el";
@@ -2499,6 +2672,7 @@
                             , seq }:
       elpaBuild {
         pname = "validate";
+        ename = "validate";
         version = "1.0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/validate-1.0.4.el";
@@ -2513,6 +2687,7 @@
     vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
       elpaBuild {
         pname = "vdiff";
+        ename = "vdiff";
         version = "0.2.3";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el";
@@ -2527,6 +2702,7 @@
     vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "vigenere";
+        ename = "vigenere";
         version = "1.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/vigenere-1.0.el";
@@ -2541,6 +2717,7 @@
     vlf = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "vlf";
+        ename = "vlf";
         version = "1.7.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar";
@@ -2555,6 +2732,7 @@
     w3 = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "w3";
+        ename = "w3";
         version = "4.0.49";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/w3-4.0.49.tar";
@@ -2569,6 +2747,7 @@
     wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "wcheck-mode";
+        ename = "wcheck-mode";
         version = "2016.1.30";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el";
@@ -2583,6 +2762,7 @@
     wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "wconf";
+        ename = "wconf";
         version = "0.2.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/wconf-0.2.1.el";
@@ -2597,6 +2777,7 @@
     web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "web-server";
+        ename = "web-server";
         version = "0.1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar";
@@ -2611,6 +2792,7 @@
     websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "websocket";
+        ename = "websocket";
         version = "1.8";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/websocket-1.8.tar";
@@ -2625,6 +2807,7 @@
     which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "which-key";
+        ename = "which-key";
         version = "3.3.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/which-key-3.3.0.tar";
@@ -2639,6 +2822,7 @@
     windresize = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "windresize";
+        ename = "windresize";
         version = "0.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/windresize-0.1.el";
@@ -2653,6 +2837,7 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "wisi";
+        ename = "wisi";
         version = "1.1.6";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar";
@@ -2667,6 +2852,7 @@
     wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "wpuzzle";
+        ename = "wpuzzle";
         version = "1.1";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/wpuzzle-1.1.el";
@@ -2681,6 +2867,7 @@
     xclip = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "xclip";
+        ename = "xclip";
         version = "1.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/xclip-1.4.el";
@@ -2695,10 +2882,11 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "xelb";
-        version = "0.14";
+        ename = "xelb";
+        version = "0.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.14.tar";
-          sha256 = "09flnbjy9ck784kprz036rwg9qk45hpv0w5hz3pz3zhwyk57fv74";
+          url = "https://elpa.gnu.org/packages/xelb-0.15.tar";
+          sha256 = "031rvgprsqhf344p9wsczr50vj2qcpwdmhxi80jdbrsm7wyxf3qz";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {
@@ -2709,6 +2897,7 @@
     xpm = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "xpm";
+        ename = "xpm";
         version = "1.0.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/xpm-1.0.4.tar";
@@ -2723,6 +2912,7 @@
     yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "yasnippet";
+        ename = "yasnippet";
         version = "0.13.0";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/yasnippet-0.13.0.tar";
@@ -2740,6 +2930,7 @@
                                               , yasnippet }:
       elpaBuild {
         pname = "yasnippet-classic-snippets";
+        ename = "yasnippet-classic-snippets";
         version = "1.0.2";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar";
@@ -2754,6 +2945,7 @@
     ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ztree";
+        ename = "ztree";
         version = "1.0.5";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar";
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 0cea8f0a731..26f4b791cc0 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -25,7 +25,7 @@ self:
     super = removeAttrs imported [ "dash" ];
 
     elpaBuild = import ../../../build-support/emacs/elpa.nix {
-      inherit fetchurl lib stdenv texinfo;
+      inherit lib stdenv texinfo;
       inherit (self) emacs;
     };
 
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 943ade3ad1f..554d48ecc51 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -6,6 +6,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "_0blayout";
+        ename = "0blayout";
         version = "20161007.2307";
         src = fetchFromGitHub {
           owner = "etu";
@@ -32,6 +33,7 @@
                         , s }:
       melpaBuild {
         pname = "_0xc";
+        ename = "0xc";
         version = "20170125.1953";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -56,6 +58,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "_2048-game";
+        ename = "2048-game";
         version = "20151026.1233";
         src = fetchhg {
           url = "https://bitbucket.com/zck/2048.el";
@@ -81,6 +84,7 @@
                              , request }:
       melpaBuild {
         pname = "_4clojure";
+        ename = "4clojure";
         version = "20131014.1507";
         src = fetchFromGitHub {
           owner = "losingkeys";
@@ -106,6 +110,7 @@
                      , melpaBuild }:
       melpaBuild {
         pname = "a";
+        ename = "a";
         version = "20170720.553";
         src = fetchFromGitHub {
           owner = "plexus";
@@ -132,6 +137,7 @@
                                 , navi2ch }:
       melpaBuild {
         pname = "aa-edit-mode";
+        ename = "aa-edit-mode";
         version = "20170118.1920";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -156,6 +162,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "abc-mode";
+        ename = "abc-mode";
         version = "20171020.319";
         src = fetchFromGitHub {
           owner = "mkjunker";
@@ -183,6 +190,7 @@
                            , s }:
       melpaBuild {
         pname = "abgaben";
+        ename = "abgaben";
         version = "20171118.2246";
         src = fetchFromGitLab {
           owner = "akoehn";
@@ -207,6 +215,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "abl-mode";
+        ename = "abl-mode";
         version = "20170604.1309";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
@@ -232,6 +241,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "abyss-theme";
+        ename = "abyss-theme";
         version = "20170808.645";
         src = fetchFromGitHub {
           owner = "mgrbyte";
@@ -259,6 +269,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ac-alchemist";
+        ename = "ac-alchemist";
         version = "20150907.2356";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -284,6 +295,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ac-c-headers";
+        ename = "ac-c-headers";
         version = "20151021.134";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -310,6 +322,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ac-capf";
+        ename = "ac-capf";
         version = "20151031.1917";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -337,6 +350,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-cider";
+        ename = "ac-cider";
         version = "20161006.19";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -366,6 +380,7 @@
                             , yasnippet }:
       melpaBuild {
         pname = "ac-clang";
+        ename = "ac-clang";
         version = "20180709.2246";
         src = fetchFromGitHub {
           owner = "yaruopooner";
@@ -392,6 +407,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ac-dcd";
+        ename = "ac-dcd";
         version = "20170323.601";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -418,6 +434,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ac-emacs-eclim";
+        ename = "ac-emacs-eclim";
         version = "20170924.1339";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -444,6 +461,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-emmet";
+        ename = "ac-emmet";
         version = "20131015.858";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -470,6 +488,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-emoji";
+        ename = "ac-emoji";
         version = "20150823.11";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -495,6 +514,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-etags";
+        ename = "ac-etags";
         version = "20161001.807";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -521,6 +541,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-geiser";
+        ename = "ac-geiser";
         version = "20130928.2347";
         src = fetchFromGitHub {
           owner = "xiaohanyu";
@@ -547,6 +568,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ac-haskell-process";
+        ename = "ac-haskell-process";
         version = "20150423.702";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -575,6 +597,7 @@
                            , popup }:
       melpaBuild {
         pname = "ac-helm";
+        ename = "ac-helm";
         version = "20160318.1933";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -603,6 +626,7 @@
                            , s }:
       melpaBuild {
         pname = "ac-html";
+        ename = "ac-html";
         version = "20151005.31";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -628,6 +652,7 @@
                                    , web-completion-data }:
       melpaBuild {
         pname = "ac-html-angular";
+        ename = "ac-html-angular";
         version = "20151224.2319";
         src = fetchFromGitHub {
           owner = "osv";
@@ -653,6 +678,7 @@
                                      , web-completion-data }:
       melpaBuild {
         pname = "ac-html-bootstrap";
+        ename = "ac-html-bootstrap";
         version = "20160302.901";
         src = fetchFromGitHub {
           owner = "osv";
@@ -678,6 +704,7 @@
                                       , web-completion-data }:
       melpaBuild {
         pname = "ac-html-csswatcher";
+        ename = "ac-html-csswatcher";
         version = "20151208.1313";
         src = fetchFromGitHub {
           owner = "osv";
@@ -704,6 +731,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ac-inf-ruby";
+        ename = "ac-inf-ruby";
         version = "20131115.350";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -730,6 +758,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-ispell";
+        ename = "ac-ispell";
         version = "20151031.1926";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -756,6 +785,7 @@
                           , skewer-mode }:
       melpaBuild {
         pname = "ac-js2";
+        ename = "ac-js2";
         version = "20140906.442";
         src = fetchFromGitHub {
           owner = "ScottyB";
@@ -782,6 +812,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ac-math";
+        ename = "ac-math";
         version = "20141116.1327";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -809,6 +840,7 @@
                            , mozc }:
       melpaBuild {
         pname = "ac-mozc";
+        ename = "ac-mozc";
         version = "20150227.819";
         src = fetchFromGitHub {
           owner = "igjit";
@@ -834,6 +866,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-octave";
+        ename = "ac-octave";
         version = "20180405.2034";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -861,6 +894,7 @@
                           , yasnippet }:
       melpaBuild {
         pname = "ac-php";
+        ename = "ac-php";
         version = "20171201.134";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -892,6 +926,7 @@
                                , xcscope }:
       melpaBuild {
         pname = "ac-php-core";
+        ename = "ac-php-core";
         version = "20180629.144";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -919,6 +954,7 @@
                             , racer }:
       melpaBuild {
         pname = "ac-racer";
+        ename = "ac-racer";
         version = "20170114.9";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -945,6 +981,7 @@
                             , rtags }:
       melpaBuild {
         pname = "ac-rtags";
+        ename = "ac-rtags";
         version = "20170522.2154";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -973,6 +1010,7 @@
                           , tinysegmenter }:
       melpaBuild {
         pname = "ac-skk";
+        ename = "ac-skk";
         version = "20141229.1719";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -1000,6 +1038,7 @@
                             , slime }:
       melpaBuild {
         pname = "ac-slime";
+        ename = "ac-slime";
         version = "20171027.1400";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -1027,6 +1066,7 @@
                           , sly }:
       melpaBuild {
         pname = "ac-sly";
+        ename = "ac-sly";
         version = "20170728.327";
         src = fetchFromGitHub {
           owner = "qoocku";
@@ -1055,6 +1095,7 @@
                                     , s }:
       melpaBuild {
         pname = "academic-phrases";
+        ename = "academic-phrases";
         version = "20180318.438";
         src = fetchFromGitHub {
           owner = "nashamri";
@@ -1080,6 +1121,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ace-flyspell";
+        ename = "ace-flyspell";
         version = "20170308.2109";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -1105,6 +1147,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ace-isearch";
+        ename = "ace-isearch";
         version = "20170506.12";
         src = fetchFromGitHub {
           owner = "tam17aki";
@@ -1131,6 +1174,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-buffer";
+        ename = "ace-jump-buffer";
         version = "20171031.850";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -1157,6 +1201,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-helm-line";
+        ename = "ace-jump-helm-line";
         version = "20160918.1136";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -1181,6 +1226,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-mode";
+        ename = "ace-jump-mode";
         version = "20140616.115";
         src = fetchFromGitHub {
           owner = "winterTTr";
@@ -1207,6 +1253,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-zap";
+        ename = "ace-jump-zap";
         version = "20170717.1149";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -1232,6 +1279,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ace-link";
+        ename = "ace-link";
         version = "20180308.100";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -1259,6 +1307,7 @@
                           , multiple-cursors }:
       melpaBuild {
         pname = "ace-mc";
+        ename = "ace-mc";
         version = "20160408.1737";
         src = fetchFromGitHub {
           owner = "mm--";
@@ -1285,6 +1334,7 @@
                               , pinyinlib }:
       melpaBuild {
         pname = "ace-pinyin";
+        ename = "ace-pinyin";
         version = "20170430.2326";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -1311,6 +1361,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ace-popup-menu";
+        ename = "ace-popup-menu";
         version = "20171231.2215";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -1336,6 +1387,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ace-window";
+        ename = "ace-window";
         version = "20180607.1223";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -1361,6 +1413,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "achievements";
+        ename = "achievements";
         version = "20150530.1126";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/emacs-achievements";
@@ -1385,6 +1438,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ack-menu";
+        ename = "ack-menu";
         version = "20150504.1322";
         src = fetchFromGitHub {
           owner = "chumpage";
@@ -1409,6 +1463,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "actionscript-mode";
+        ename = "actionscript-mode";
         version = "20180527.1001";
         src = fetchFromGitHub {
           owner = "austinhaas";
@@ -1434,6 +1489,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "adafruit-wisdom";
+        ename = "adafruit-wisdom";
         version = "20180224.1652";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -1458,6 +1514,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "add-hooks";
+        ename = "add-hooks";
         version = "20171216.1723";
         src = fetchFromGitHub {
           owner = "nickmccurdy";
@@ -1482,6 +1539,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "add-node-modules-path";
+        ename = "add-node-modules-path";
         version = "20180710.1642";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -1507,6 +1565,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "addressbook-bookmark";
+        ename = "addressbook-bookmark";
         version = "20171107.2234";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -1532,6 +1591,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "adoc-mode";
+        ename = "adoc-mode";
         version = "20160314.1430";
         src = fetchFromGitHub {
           owner = "sensorflo";
@@ -1556,6 +1616,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "aes";
+        ename = "aes";
         version = "20171028.2323";
         src = fetchFromGitHub {
           owner = "Sauermann";
@@ -1581,6 +1642,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "afternoon-theme";
+        ename = "afternoon-theme";
         version = "20140104.1059";
         src = fetchFromGitHub {
           owner = "osener";
@@ -1608,6 +1670,7 @@
                       , s }:
       melpaBuild {
         pname = "ag";
+        ename = "ag";
         version = "20180225.240";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -1633,6 +1696,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "aggressive-fill-paragraph";
+        ename = "aggressive-fill-paragraph";
         version = "20170902.705";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -1659,6 +1723,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "aggressive-indent";
+        ename = "aggressive-indent";
         version = "20180626.1721";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -1683,6 +1748,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ahg";
+        ename = "ahg";
         version = "20180125.944";
         src = fetchhg {
           url = "https://bitbucket.com/agriggio/ahg";
@@ -1707,6 +1773,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ahk-mode";
+        ename = "ahk-mode";
         version = "20160320.1521";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -1732,6 +1799,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ahungry-theme";
+        ename = "ahungry-theme";
         version = "20180130.1928";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -1757,6 +1825,7 @@
                                   , powerline }:
       melpaBuild {
         pname = "airline-themes";
+        ename = "airline-themes";
         version = "20180410.2106";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
@@ -1784,6 +1853,7 @@
                            , simple-httpd }:
       melpaBuild {
         pname = "airplay";
+        ename = "airplay";
         version = "20130212.426";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -1811,6 +1881,7 @@
                              , s }:
       melpaBuild {
         pname = "alan-mode";
+        ename = "alan-mode";
         version = "20180711.2148";
         src = fetchFromGitHub {
           owner = "M-industries";
@@ -1841,6 +1912,7 @@
                              , s }:
       melpaBuild {
         pname = "alchemist";
+        ename = "alchemist";
         version = "20180312.604";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -1866,6 +1938,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "alda-mode";
+        ename = "alda-mode";
         version = "20180607.2305";
         src = fetchFromGitLab {
           owner = "jgkamat";
@@ -1891,6 +1964,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "alect-themes";
+        ename = "alect-themes";
         version = "20180504.1020";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -1917,6 +1991,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "alert";
+        ename = "alert";
         version = "20180403.38";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -1942,6 +2017,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "align-cljlet";
+        ename = "align-cljlet";
         version = "20160112.1301";
         src = fetchFromGitHub {
           owner = "gstamp";
@@ -1967,6 +2043,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "all-ext";
+        ename = "all-ext";
         version = "20170114.1805";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -1993,6 +2070,7 @@
                                  , memoize }:
       melpaBuild {
         pname = "all-the-icons";
+        ename = "all-the-icons";
         version = "20180125.757";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -2019,6 +2097,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "all-the-icons-dired";
+        ename = "all-the-icons-dired";
         version = "20170418.1431";
         src = fetchFromGitHub {
           owner = "jtbm37";
@@ -2046,6 +2125,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "all-the-icons-gnus";
+        ename = "all-the-icons-gnus";
         version = "20180510.2354";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -2073,6 +2153,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "all-the-icons-ivy";
+        ename = "all-the-icons-ivy";
         version = "20180225.630";
         src = fetchFromGitHub {
           owner = "asok";
@@ -2105,6 +2186,7 @@
                             , seq }:
       melpaBuild {
         pname = "amd-mode";
+        ename = "amd-mode";
         version = "20180111.602";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -2138,6 +2220,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ample-regexps";
+        ename = "ample-regexps";
         version = "20151023.300";
         src = fetchFromGitHub {
           owner = "immerrr";
@@ -2162,6 +2245,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ample-theme";
+        ename = "ample-theme";
         version = "20180207.945";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
@@ -2186,6 +2270,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ample-zen-theme";
+        ename = "ample-zen-theme";
         version = "20150119.1354";
         src = fetchFromGitHub {
           owner = "mjwall";
@@ -2212,6 +2297,7 @@
                        , s }:
       melpaBuild {
         pname = "amx";
+        ename = "amx";
         version = "20180627.1555";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -2241,6 +2327,7 @@
                                  , s }:
       melpaBuild {
         pname = "anaconda-mode";
+        ename = "anaconda-mode";
         version = "20180707.1010";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -2265,6 +2352,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "anaphora";
+        ename = "anaphora";
         version = "20180618.1500";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -2289,6 +2377,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "android-mode";
+        ename = "android-mode";
         version = "20170323.115";
         src = fetchFromGitHub {
           owner = "remvee";
@@ -2313,6 +2402,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "angry-police-captain";
+        ename = "angry-police-captain";
         version = "20120829.552";
         src = fetchFromGitHub {
           owner = "rolpereira";
@@ -2337,6 +2427,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "angular-mode";
+        ename = "angular-mode";
         version = "20151201.1327";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -2363,6 +2454,7 @@
                                     , s }:
       melpaBuild {
         pname = "angular-snippets";
+        ename = "angular-snippets";
         version = "20140513.2223";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -2390,6 +2482,7 @@
                                , request }:
       melpaBuild {
         pname = "anki-editor";
+        ename = "anki-editor";
         version = "20180715.151";
         src = fetchFromGitHub {
           owner = "louietan";
@@ -2414,6 +2507,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "annotate";
+        ename = "annotate";
         version = "20171110.2336";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -2438,6 +2532,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "annotate-depth";
+        ename = "annotate-depth";
         version = "20160520.1340";
         src = fetchFromGitHub {
           owner = "netromdk";
@@ -2463,6 +2558,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "annoying-arrows-mode";
+        ename = "annoying-arrows-mode";
         version = "20161023.2346";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -2489,6 +2585,7 @@
                         , s }:
       melpaBuild {
         pname = "ansi";
+        ename = "ansi";
         version = "20150703.126";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -2515,6 +2612,7 @@
                            , s }:
       melpaBuild {
         pname = "ansible";
+        ename = "ansible";
         version = "20170926.1951";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -2540,6 +2638,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ansible-doc";
+        ename = "ansible-doc";
         version = "20160924.124";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -2565,6 +2664,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ansible-vault";
+        ename = "ansible-vault";
         version = "20170111.1318";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -2589,6 +2689,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ant";
+        ename = "ant";
         version = "20160211.743";
         src = fetchFromGitHub {
           owner = "apg";
@@ -2613,6 +2714,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "anti-zenburn-theme";
+        ename = "anti-zenburn-theme";
         version = "20180712.1138";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -2637,6 +2739,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "anx-api";
+        ename = "anx-api";
         version = "20140208.714";
         src = fetchFromGitHub {
           owner = "rmloveland";
@@ -2661,6 +2764,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "anybar";
+        ename = "anybar";
         version = "20160816.721";
         src = fetchFromGitHub {
           owner = "tie-rack";
@@ -2685,6 +2789,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "anyins";
+        ename = "anyins";
         version = "20131229.241";
         src = fetchFromGitHub {
           owner = "antham";
@@ -2710,6 +2815,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "anzu";
+        ename = "anzu";
         version = "20161017.907";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -2734,6 +2840,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "aozora-view";
+        ename = "aozora-view";
         version = "20140310.617";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -2758,6 +2865,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "apache-mode";
+        ename = "apache-mode";
         version = "20170711.913";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -2782,6 +2890,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "apel";
+        ename = "apel";
         version = "20170122.1458";
         src = fetchFromGitHub {
           owner = "wanderlust";
@@ -2807,6 +2916,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "apib-mode";
+        ename = "apib-mode";
         version = "20170520.658";
         src = fetchFromGitHub {
           owner = "w-vi";
@@ -2832,6 +2942,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "apiwrap";
+        ename = "apiwrap";
         version = "20180602.1531";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -2856,6 +2967,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "apples-mode";
+        ename = "apples-mode";
         version = "20110120.2018";
         src = fetchFromGitHub {
           owner = "tequilasunset";
@@ -2880,6 +2992,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "applescript-mode";
+        ename = "applescript-mode";
         version = "20090320.2332";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -2904,6 +3017,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "aproject";
+        ename = "aproject";
         version = "20150605.206";
         src = fetchFromGitHub {
           owner = "vietor";
@@ -2928,12 +3042,13 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "apropospriate-theme";
-        version = "20180223.1526";
+        ename = "apropospriate-theme";
+        version = "20180718.1101";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "019ed5cf8f1e1abfead7adceeda88938dfe928b7";
-          sha256 = "0x6iw9dr3zvy2xqxadlxkjhpkfgig009x0ilipdji20hpa0qhhgm";
+          rev = "97a26598a4d64f8339f7b12818d67425057235be";
+          sha256 = "1bi9srxc91i81v863k5fpvgxhr7hkz22jbzwajgqbs0kx5jn7417";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2953,6 +3068,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "apt-sources-list";
+        ename = "apt-sources-list";
         version = "20180527.541";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/apt-sources-list.git";
@@ -2980,6 +3096,7 @@
                                , s }:
       melpaBuild {
         pname = "arch-packer";
+        ename = "arch-packer";
         version = "20170730.621";
         src = fetchFromGitHub {
           owner = "brotzeit";
@@ -3004,6 +3121,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "archive-region";
+        ename = "archive-region";
         version = "20140201.1542";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -3029,6 +3147,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "archive-rpm";
+        ename = "archive-rpm";
         version = "20180706.532";
         src = fetchFromGitHub {
           owner = "legoscia";
@@ -3056,6 +3175,7 @@
                                 , spinner }:
       melpaBuild {
         pname = "arduino-mode";
+        ename = "arduino-mode";
         version = "20180508.1736";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -3081,6 +3201,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "aria2";
+        ename = "aria2";
         version = "20141107.1517";
         src = fetchFromGitLab {
           owner = "ukaszg";
@@ -3106,6 +3227,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ariadne";
+        ename = "ariadne";
         version = "20131117.911";
         src = fetchFromGitHub {
           owner = "manzyuk";
@@ -3130,6 +3252,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "arjen-grey-theme";
+        ename = "arjen-grey-theme";
         version = "20170522.1347";
         src = fetchFromGitHub {
           owner = "credmp";
@@ -3154,6 +3277,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "artbollocks-mode";
+        ename = "artbollocks-mode";
         version = "20170523.2122";
         src = fetchFromGitHub {
           owner = "sachac";
@@ -3178,6 +3302,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "arview";
+        ename = "arview";
         version = "20160419.1409";
         src = fetchFromGitHub {
           owner = "afainer";
@@ -3204,6 +3329,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "asilea";
+        ename = "asilea";
         version = "20150105.725";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -3230,6 +3356,7 @@
                              , s }:
       melpaBuild {
         pname = "asn1-mode";
+        ename = "asn1-mode";
         version = "20170728.1926";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -3256,6 +3383,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "assess";
+        ename = "assess";
         version = "20170504.657";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -3280,6 +3408,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "async";
+        ename = "async";
         version = "20180527.1030";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -3306,6 +3435,7 @@
                                , promise }:
       melpaBuild {
         pname = "async-await";
+        ename = "async-await";
         version = "20170208.350";
         src = fetchFromGitHub {
           owner = "chuntaro";
@@ -3332,6 +3462,7 @@
                       , queue }:
       melpaBuild {
         pname = "at";
+        ename = "@";
         version = "20140707.520";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -3356,6 +3487,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "atom-dark-theme";
+        ename = "atom-dark-theme";
         version = "20170710.1612";
         src = fetchFromGitHub {
           owner = "whitlockjc";
@@ -3380,6 +3512,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "atom-one-dark-theme";
+        ename = "atom-one-dark-theme";
         version = "20180607.1638";
         src = fetchFromGitHub {
           owner = "jonathanchu";
@@ -3407,6 +3540,7 @@
                                  , websocket }:
       melpaBuild {
         pname = "atomic-chrome";
+        ename = "atomic-chrome";
         version = "20180617.24";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -3436,6 +3570,7 @@
                           , s }:
       melpaBuild {
         pname = "attrap";
+        ename = "attrap";
         version = "20180715.1205";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -3461,6 +3596,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "auctex-latexmk";
+        ename = "auctex-latexmk";
         version = "20170618.936";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -3487,6 +3623,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "auctex-lua";
+        ename = "auctex-lua";
         version = "20151121.810";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -3511,6 +3648,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "audio-notes-mode";
+        ename = "audio-notes-mode";
         version = "20170611.1459";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -3538,6 +3676,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "aurel";
+        ename = "aurel";
         version = "20170114.137";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -3562,6 +3701,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "aurora-config-mode";
+        ename = "aurora-config-mode";
         version = "20180216.1502";
         src = fetchFromGitHub {
           owner = "bdd";
@@ -3587,6 +3727,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "auth-source-pass";
+        ename = "auth-source-pass";
         version = "20180529.657";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -3611,6 +3752,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "auto-async-byte-compile";
+        ename = "auto-async-byte-compile";
         version = "20160915.2154";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -3637,6 +3779,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "auto-auto-indent";
+        ename = "auto-auto-indent";
         version = "20131106.1103";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -3663,6 +3806,7 @@
                                 , packed }:
       melpaBuild {
         pname = "auto-compile";
+        ename = "auto-compile";
         version = "20180321.807";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -3689,6 +3833,7 @@
                                  , popup }:
       melpaBuild {
         pname = "auto-complete";
+        ename = "auto-complete";
         version = "20170124.1845";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -3715,6 +3860,7 @@
                                         , yasnippet }:
       melpaBuild {
         pname = "auto-complete-auctex";
+        ename = "auto-complete-auctex";
         version = "20140223.958";
         src = fetchFromGitHub {
           owner = "monsanto";
@@ -3740,6 +3886,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-c-headers";
+        ename = "auto-complete-c-headers";
         version = "20150911.2023";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -3765,6 +3912,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-chunk";
+        ename = "auto-complete-chunk";
         version = "20140225.146";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -3790,6 +3938,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-clang";
+        ename = "auto-complete-clang";
         version = "20140409.52";
         src = fetchFromGitHub {
           owner = "brianjcj";
@@ -3814,6 +3963,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-clang-async";
+        ename = "auto-complete-clang-async";
         version = "20130526.814";
         src = fetchFromGitHub {
           owner = "Golevka";
@@ -3840,6 +3990,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-distel";
+        ename = "auto-complete-distel";
         version = "20160815.2300";
         src = fetchFromGitHub {
           owner = "sebastiw";
@@ -3865,6 +4016,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-exuberant-ctags";
+        ename = "auto-complete-exuberant-ctags";
         version = "20140320.24";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -3890,6 +4042,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-nxml";
+        ename = "auto-complete-nxml";
         version = "20140220.2058";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -3917,6 +4070,7 @@
                                       , yaxception }:
       melpaBuild {
         pname = "auto-complete-pcmp";
+        ename = "auto-complete-pcmp";
         version = "20140226.2251";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -3942,6 +4096,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-rst";
+        ename = "auto-complete-rst";
         version = "20140225.144";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -3968,6 +4123,7 @@
                                       , sage-shell-mode }:
       melpaBuild {
         pname = "auto-complete-sage";
+        ename = "auto-complete-sage";
         version = "20160514.51";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -3992,6 +4148,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "auto-dictionary";
+        ename = "auto-dictionary";
         version = "20150410.910";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -4016,6 +4173,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "auto-dim-other-buffers";
+        ename = "auto-dim-other-buffers";
         version = "20180612.1641";
         src = fetchFromGitHub {
           owner = "mina86";
@@ -4040,6 +4198,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "auto-highlight-symbol";
+        ename = "auto-highlight-symbol";
         version = "20130313.243";
         src = fetchFromGitHub {
           owner = "gennad";
@@ -4064,6 +4223,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "auto-indent-mode";
+        ename = "auto-indent-mode";
         version = "20171221.2106";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -4089,6 +4249,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "auto-minor-mode";
+        ename = "auto-minor-mode";
         version = "20180527.423";
         src = fetchFromGitHub {
           owner = "joewreschnig";
@@ -4114,6 +4275,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "auto-org-md";
+        ename = "auto-org-md";
         version = "20180213.1543";
         src = fetchFromGitHub {
           owner = "jamcha-aa";
@@ -4140,6 +4302,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "auto-package-update";
+        ename = "auto-package-update";
         version = "20180712.1345";
         src = fetchFromGitHub {
           owner = "rranelli";
@@ -4165,6 +4328,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "auto-pause";
+        ename = "auto-pause";
         version = "20160426.516";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -4190,6 +4354,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "auto-read-only";
+        ename = "auto-read-only";
         version = "20170305.2043";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -4214,6 +4379,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "auto-save-buffers-enhanced";
+        ename = "auto-save-buffers-enhanced";
         version = "20161108.2310";
         src = fetchFromGitHub {
           owner = "kentaro";
@@ -4240,6 +4406,7 @@
                                       , popwin }:
       melpaBuild {
         pname = "auto-shell-command";
+        ename = "auto-shell-command";
         version = "20160603.1938";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -4266,6 +4433,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "auto-sudoedit";
+        ename = "auto-sudoedit";
         version = "20180428.2343";
         src = fetchFromGitHub {
           owner = "ncaq";
@@ -4293,6 +4461,7 @@
                                    , s }:
       melpaBuild {
         pname = "auto-virtualenv";
+        ename = "auto-virtualenv";
         version = "20170125.1117";
         src = fetchFromGitHub {
           owner = "marcwebbie";
@@ -4320,6 +4489,7 @@
                                           , virtualenvwrapper }:
       melpaBuild {
         pname = "auto-virtualenvwrapper";
+        ename = "auto-virtualenvwrapper";
         version = "20180408.310";
         src = fetchFromGitHub {
           owner = "robert-zaremba";
@@ -4345,6 +4515,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "auto-yasnippet";
+        ename = "auto-yasnippet";
         version = "20180503.1208";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -4371,6 +4542,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "autobookmarks";
+        ename = "autobookmarks";
         version = "20180531.1206";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -4395,6 +4567,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "autodisass-java-bytecode";
+        ename = "autodisass-java-bytecode";
         version = "20151005.912";
         src = fetchFromGitHub {
           owner = "gbalats";
@@ -4419,6 +4592,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "autodisass-llvm-bitcode";
+        ename = "autodisass-llvm-bitcode";
         version = "20150410.1825";
         src = fetchFromGitHub {
           owner = "gbalats";
@@ -4443,6 +4617,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "automargin";
+        ename = "automargin";
         version = "20131112.14";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -4468,6 +4643,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "autopair";
+        ename = "autopair";
         version = "20160304.437";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -4492,6 +4668,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "autotest";
+        ename = "autotest";
         version = "20180323.1542";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -4517,6 +4694,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "autotetris-mode";
+        ename = "autotetris-mode";
         version = "20141114.846";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -4544,6 +4722,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "autothemer";
+        ename = "autothemer";
         version = "20170112.1324";
         src = fetchFromGitHub {
           owner = "sebastiansturm";
@@ -4568,6 +4747,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "autumn-light-theme";
+        ename = "autumn-light-theme";
         version = "20150515.747";
         src = fetchFromGitHub {
           owner = "aalpern";
@@ -4592,6 +4772,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "avandu";
+        ename = "avandu";
         version = "20170101.1103";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -4616,6 +4797,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "avk-emacs-themes";
+        ename = "avk-emacs-themes";
         version = "20180406.2220";
         src = fetchFromGitHub {
           owner = "avkoval";
@@ -4642,6 +4824,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "avy";
+        ename = "avy";
         version = "20180615.801";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -4670,6 +4853,7 @@
                                 , seq }:
       melpaBuild {
         pname = "avy-flycheck";
+        ename = "avy-flycheck";
         version = "20160720.800";
         src = fetchFromGitHub {
           owner = "magicdirac";
@@ -4696,6 +4880,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "avy-menu";
+        ename = "avy-menu";
         version = "20171231.2220";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -4723,12 +4908,13 @@
                               , migemo }:
       melpaBuild {
         pname = "avy-migemo";
-        version = "20180508.951";
+        ename = "avy-migemo";
+        version = "20180716.755";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "3e472cb4de338c312a6731f4f627b140beddf5f0";
-          sha256 = "15xk6in8hdvkf2330j03llzjjxyyawad4rdq3zp4kwh4wgg0icdk";
+          rev = "922a6dd82c0bfa316b0fbb56a9d4dd4ffa5707e7";
+          sha256 = "1a4421h15ba7lsnbh8kqm3hvs06fp830wb1nvwgpsk7vmqqi2qgl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4748,6 +4934,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "avy-zap";
+        ename = "avy-zap";
         version = "20160921.1444";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -4775,6 +4962,7 @@
                            , tblui }:
       melpaBuild {
         pname = "aws-ec2";
+        ename = "aws-ec2";
         version = "20161007.1214";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
@@ -4800,6 +4988,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "aws-snippets";
+        ename = "aws-snippets";
         version = "20180410.845";
         src = fetchFromGitHub {
           owner = "baron42bba";
@@ -4825,6 +5014,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "axiom-environment";
+        ename = "axiom-environment";
         version = "20180401.1257";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
@@ -4848,6 +5038,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "babel";
+        ename = "babel";
         version = "20161122.2340";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -4873,6 +5064,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "babel-repl";
+        ename = "babel-repl";
         version = "20160504.1501";
         src = fetchFromGitHub {
           owner = "hung-phan";
@@ -4903,6 +5095,7 @@
                                , ucs-utils }:
       melpaBuild {
         pname = "back-button";
+        ename = "back-button";
         version = "20150804.1304";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -4935,6 +5128,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "backlight";
+        ename = "backlight";
         version = "20180629.1459";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -4959,6 +5153,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "backup-each-save";
+        ename = "backup-each-save";
         version = "20180226.2157";
         src = fetchFromGitHub {
           owner = "conornash";
@@ -4983,6 +5178,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "backup-walker";
+        ename = "backup-walker";
         version = "20130720.816";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -5008,6 +5204,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "backward-forward";
+        ename = "backward-forward";
         version = "20161228.2150";
         src = fetchFromGitLab {
           owner = "vancan1ty";
@@ -5032,6 +5229,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "badger-theme";
+        ename = "badger-theme";
         version = "20140716.1932";
         src = fetchFromGitHub {
           owner = "ccann";
@@ -5057,6 +5255,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "badwolf-theme";
+        ename = "badwolf-theme";
         version = "20161004.15";
         src = fetchFromGitHub {
           owner = "bkruczyk";
@@ -5082,6 +5281,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "banner-comment";
+        ename = "banner-comment";
         version = "20180510.620";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
@@ -5106,6 +5306,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bar-cursor";
+        ename = "bar-cursor";
         version = "20180226.1645";
         src = fetchFromGitHub {
           owner = "ajsquared";
@@ -5131,6 +5332,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bart-mode";
+        ename = "bart-mode";
         version = "20180131.1829";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -5155,6 +5357,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "base16-theme";
+        ename = "base16-theme";
         version = "20180524.1311";
         src = fetchFromGitHub {
           owner = "belak";
@@ -5179,6 +5382,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "bash-completion";
+        ename = "bash-completion";
         version = "20180519.920";
         src = fetchFromGitHub {
           owner = "szermatt";
@@ -5205,6 +5409,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "basic-c-compile";
+        ename = "basic-c-compile";
         version = "20170302.312";
         src = fetchFromGitHub {
           owner = "nick96";
@@ -5231,6 +5436,7 @@
                               , seq }:
       melpaBuild {
         pname = "basic-mode";
+        ename = "basic-mode";
         version = "20180612.1152";
         src = fetchFromGitHub {
           owner = "dykstrom";
@@ -5256,6 +5462,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "basic-theme";
+        ename = "basic-theme";
         version = "20160817.127";
         src = fetchFromGitHub {
           owner = "fgeller";
@@ -5280,6 +5487,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bats-mode";
+        ename = "bats-mode";
         version = "20160513.2315";
         src = fetchFromGitHub {
           owner = "dougm";
@@ -5305,6 +5513,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bazel-mode";
+        ename = "bazel-mode";
         version = "20180222.2253";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -5330,6 +5539,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "bbcode-mode";
+        ename = "bbcode-mode";
         version = "20180505.227";
         src = fetchFromGitHub {
           owner = "lassik";
@@ -5354,6 +5564,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "bbdb";
+        ename = "bbdb";
         version = "20180502.2038";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/bbdb.git";
@@ -5380,6 +5591,7 @@
                          , yaxception }:
       melpaBuild {
         pname = "bbdb-";
+        ename = "bbdb-";
         version = "20140221.1554";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -5407,6 +5619,7 @@
                                    , pcsv }:
       melpaBuild {
         pname = "bbdb-csv-import";
+        ename = "bbdb-csv-import";
         version = "20180121.1649";
         src = fetchFromGitLab {
           owner = "iankelling";
@@ -5432,6 +5645,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bbdb-ext";
+        ename = "bbdb-ext";
         version = "20151220.1213";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -5457,6 +5671,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bbdb-vcard";
+        ename = "bbdb-vcard";
         version = "20150713.1350";
         src = fetchFromGitHub {
           owner = "tohojo";
@@ -5482,6 +5697,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bbdb2erc";
+        ename = "bbdb2erc";
         version = "20170221.554";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -5508,6 +5724,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "bbyac";
+        ename = "bbyac";
         version = "20180206.641";
         src = fetchFromGitHub {
           owner = "baohaojun";
@@ -5532,6 +5749,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bdo";
+        ename = "bdo";
         version = "20140126.101";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -5557,6 +5775,7 @@
                           , seq }:
       melpaBuild {
         pname = "beacon";
+        ename = "beacon";
         version = "20180706.1025";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -5582,6 +5801,7 @@
                              , org }:
       melpaBuild {
         pname = "beeminder";
+        ename = "beeminder";
         version = "20180413.1229";
         src = fetchFromGitHub {
           owner = "Sodaware";
@@ -5607,6 +5827,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "beginend";
+        ename = "beginend";
         version = "20171003.548";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -5631,6 +5852,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "belarus-holidays";
+        ename = "belarus-holidays";
         version = "20180615.611";
         src = fetchgit {
           url = "https://bitbucket.org/EugeneMakei/belarus-holidays.el";
@@ -5654,6 +5876,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "benchmark-init";
+        ename = "benchmark-init";
         version = "20150905.238";
         src = fetchFromGitHub {
           owner = "dholm";
@@ -5678,6 +5901,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "benchstat";
+        ename = "benchstat";
         version = "20171013.2012";
         src = fetchFromGitHub {
           owner = "Quasilyte";
@@ -5702,6 +5926,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "bert";
+        ename = "bert";
         version = "20131117.214";
         src = fetchFromGitHub {
           owner = "manzyuk";
@@ -5726,6 +5951,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "better-defaults";
+        ename = "better-defaults";
         version = "20170613.2104";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -5751,6 +5977,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "better-shell";
+        ename = "better-shell";
         version = "20180625.616";
         src = fetchFromGitHub {
           owner = "killdash9";
@@ -5775,6 +6002,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bf-mode";
+        ename = "bf-mode";
         version = "20130403.742";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -5800,6 +6028,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bfbuilder";
+        ename = "bfbuilder";
         version = "20150924.950";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -5826,6 +6055,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "biblio";
+        ename = "biblio";
         version = "20161014.1604";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -5854,6 +6084,7 @@
                                , seq }:
       melpaBuild {
         pname = "biblio-core";
+        ename = "biblio-core";
         version = "20160901.1115";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -5881,6 +6112,7 @@
                               , pdf-tools }:
       melpaBuild {
         pname = "bibliothek";
+        ename = "bibliothek";
         version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
@@ -5907,6 +6139,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "bibretrieve";
+        ename = "bibretrieve";
         version = "20180617.1108";
         src = fetchFromGitHub {
           owner = "pzorin";
@@ -5933,6 +6166,7 @@
                             , s }:
       melpaBuild {
         pname = "bibslurp";
+        ename = "bibslurp";
         version = "20151202.1546";
         src = fetchFromGitHub {
           owner = "mkmcc";
@@ -5957,6 +6191,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "bibtex-utils";
+        ename = "bibtex-utils";
         version = "20170817.1219";
         src = fetchFromGitHub {
           owner = "plantarum";
@@ -5982,6 +6217,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bicycle";
+        ename = "bicycle";
         version = "20180624.12";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -6007,6 +6243,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bifocal";
+        ename = "bifocal";
         version = "20171004.1124";
         src = fetchFromGitHub {
           owner = "riscy";
@@ -6032,6 +6269,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "binclock";
+        ename = "binclock";
         version = "20170802.416";
         src = fetchFromGitHub {
           owner = "davep";
@@ -6058,6 +6296,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bind-chord";
+        ename = "bind-chord";
         version = "20171204.1210";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -6082,6 +6321,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bind-key";
+        ename = "bind-key";
         version = "20180512.2130";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -6107,6 +6347,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bind-map";
+        ename = "bind-map";
         version = "20161207.711";
         src = fetchFromGitHub {
           owner = "justbur";
@@ -6131,6 +6372,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bing-dict";
+        ename = "bing-dict";
         version = "20170604.1831";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -6155,6 +6397,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "birds-of-paradise-plus-theme";
+        ename = "birds-of-paradise-plus-theme";
         version = "20130419.1429";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -6179,6 +6422,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bison-mode";
+        ename = "bison-mode";
         version = "20160616.2252";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -6207,6 +6451,7 @@
                            , s }:
       melpaBuild {
         pname = "bitbake";
+        ename = "bitbake";
         version = "20180326.58";
         src = fetchFromGitHub {
           owner = "canatella";
@@ -6234,6 +6479,7 @@
                              , s }:
       melpaBuild {
         pname = "bitbucket";
+        ename = "bitbucket";
         version = "20170404.2146";
         src = fetchFromGitHub {
           owner = "tjaartvdwalt";
@@ -6258,6 +6504,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bitlbee";
+        ename = "bitlbee";
         version = "20151202.1600";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -6283,6 +6530,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "blackboard-bold-mode";
+        ename = "blackboard-bold-mode";
         version = "20160812.1906";
         src = fetchFromGitHub {
           owner = "grettke";
@@ -6308,6 +6556,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "blackboard-theme";
+        ename = "blackboard-theme";
         version = "20161215.2256";
         src = fetchFromGitHub {
           owner = "don9z";
@@ -6333,6 +6582,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "blacken";
+        ename = "blacken";
         version = "20180615.803";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -6358,6 +6608,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "blgrep";
+        ename = "blgrep";
         version = "20150401.716";
         src = fetchFromGitHub {
           owner = "ataka";
@@ -6383,6 +6634,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "bliss-theme";
+        ename = "bliss-theme";
         version = "20170808.607";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -6407,6 +6659,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bln-mode";
+        ename = "bln-mode";
         version = "20170112.527";
         src = fetchFromGitHub {
           owner = "mgrachten";
@@ -6432,6 +6685,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "blockdiag-mode";
+        ename = "blockdiag-mode";
         version = "20160426.2224";
         src = fetchFromGitHub {
           owner = "xcezx";
@@ -6461,6 +6715,7 @@
                               , s }:
       melpaBuild {
         pname = "blog-admin";
+        ename = "blog-admin";
         version = "20170923.709";
         src = fetchFromGitHub {
           owner = "CodeFalling";
@@ -6490,6 +6745,7 @@
                                 , simple-httpd }:
       melpaBuild {
         pname = "blog-minimal";
+        ename = "blog-minimal";
         version = "20170311.555";
         src = fetchFromGitHub {
           owner = "thiefuniverse";
@@ -6514,6 +6770,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "bm";
+        ename = "bm";
         version = "20180703.343";
         src = fetchFromGitHub {
           owner = "joodland";
@@ -6543,6 +6800,7 @@
                             , s }:
       melpaBuild {
         pname = "bmx-mode";
+        ename = "bmx-mode";
         version = "20180324.857";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -6568,6 +6826,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "bnfc";
+        ename = "bnfc";
         version = "20160605.1227";
         src = fetchFromGitHub {
           owner = "jmitchell";
@@ -6593,6 +6852,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bog";
+        ename = "bog";
         version = "20180113.759";
         src = fetchFromGitHub {
           owner = "kyleam";
@@ -6618,6 +6878,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bolt-mode";
+        ename = "bolt-mode";
         version = "20180310.10";
         src = fetchFromGitHub {
           owner = "mpontus";
@@ -6644,6 +6905,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "bongo";
+        ename = "bongo";
         version = "20171118.1842";
         src = fetchFromGitHub {
           owner = "dbrock";
@@ -6668,6 +6930,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "bonjourmadame";
+        ename = "bonjourmadame";
         version = "20170919.434";
         src = fetchFromGitHub {
           owner = "pierre-lecocq";
@@ -6697,6 +6960,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "boogie-friends";
+        ename = "boogie-friends";
         version = "20171024.1955";
         src = fetchFromGitHub {
           owner = "boogie-org";
@@ -6722,6 +6986,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bool-flip";
+        ename = "bool-flip";
         version = "20161215.739";
         src = fetchFromGitHub {
           owner = "michaeljb";
@@ -6750,6 +7015,7 @@
                         , multiple-cursors }:
       melpaBuild {
         pname = "boon";
+        ename = "boon";
         version = "20180319.526";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -6778,6 +7044,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "borg";
+        ename = "borg";
         version = "20180702.1353";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -6803,6 +7070,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "borland-blue-theme";
+        ename = "borland-blue-theme";
         version = "20160117.521";
         src = fetchFromGitHub {
           owner = "fourier";
@@ -6828,6 +7096,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "boron-theme";
+        ename = "boron-theme";
         version = "20170808.608";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -6853,6 +7122,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "boxquote";
+        ename = "boxquote";
         version = "20170802.417";
         src = fetchFromGitHub {
           owner = "davep";
@@ -6878,6 +7148,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bpe";
+        ename = "bpe";
         version = "20141228.1405";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -6903,6 +7174,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bpr";
+        ename = "bpr";
         version = "20180220.1044";
         src = fetchFromGitHub {
           owner = "ilya-babanov";
@@ -6928,6 +7200,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "bracketed-paste";
+        ename = "bracketed-paste";
         version = "20160407.1648";
         src = fetchFromGitHub {
           owner = "hchbaw";
@@ -6953,6 +7226,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "brainfuck-mode";
+        ename = "brainfuck-mode";
         version = "20150113.42";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -6978,6 +7252,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "broadcast";
+        ename = "broadcast";
         version = "20151204.1812";
         src = fetchFromGitHub {
           owner = "killdash9";
@@ -7005,6 +7280,7 @@
                                     , s }:
       melpaBuild {
         pname = "browse-at-remote";
+        ename = "browse-at-remote";
         version = "20180621.2331";
         src = fetchFromGitHub {
           owner = "rmuslimov";
@@ -7029,6 +7305,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "browse-kill-ring";
+        ename = "browse-kill-ring";
         version = "20171219.1108";
         src = fetchFromGitHub {
           owner = "browse-kill-ring";
@@ -7054,6 +7331,7 @@
                                    , string-utils }:
       melpaBuild {
         pname = "browse-url-dwim";
+        ename = "browse-url-dwim";
         version = "20140731.1222";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -7080,6 +7358,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "bshell";
+        ename = "bshell";
         version = "20170903.1137";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -7106,6 +7385,7 @@
                               , request }:
       melpaBuild {
         pname = "btc-ticker";
+        ename = "btc-ticker";
         version = "20151113.659";
         src = fetchFromGitHub {
           owner = "niedbalski";
@@ -7136,6 +7416,7 @@
                        , yaxception }:
       melpaBuild {
         pname = "bts";
+        ename = "bts";
         version = "20151109.533";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -7162,6 +7443,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bts-github";
+        ename = "bts-github";
         version = "20170401.549";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -7187,6 +7469,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "bubbleberry-theme";
+        ename = "bubbleberry-theme";
         version = "20141017.244";
         src = fetchFromGitHub {
           owner = "jasonm23";
@@ -7211,6 +7494,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "buckwalter";
+        ename = "buckwalter";
         version = "20180107.843";
         src = fetchFromGitHub {
           owner = "joehakimrahme";
@@ -7235,6 +7519,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "buffer-buttons";
+        ename = "buffer-buttons";
         version = "20150106.639";
         src = fetchFromGitHub {
           owner = "rpav";
@@ -7259,6 +7544,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buffer-flip";
+        ename = "buffer-flip";
         version = "20180307.1451";
         src = fetchFromGitHub {
           owner = "killdash9";
@@ -7286,6 +7572,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "buffer-manage";
+        ename = "buffer-manage";
         version = "20180528.913";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -7310,6 +7597,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buffer-move";
+        ename = "buffer-move";
         version = "20160615.1103";
         src = fetchFromGitHub {
           owner = "lukhas";
@@ -7335,6 +7623,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buffer-sets";
+        ename = "buffer-sets";
         version = "20170717.2040";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
@@ -7358,6 +7647,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "buffer-utils";
+        ename = "buffer-utils";
         version = "20140512.700";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -7384,6 +7674,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "buffer-watcher";
+        ename = "buffer-watcher";
         version = "20170913.139";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -7409,6 +7700,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bufshow";
+        ename = "bufshow";
         version = "20130726.1138";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -7433,6 +7725,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "bug-reference-github";
+        ename = "bug-reference-github";
         version = "20180128.514";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -7459,6 +7752,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bui";
+        ename = "bui";
         version = "20171215.930";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -7484,6 +7778,7 @@
                                 , projectile }:
       melpaBuild {
         pname = "build-helper";
+        ename = "build-helper";
         version = "20161009.1055";
         src = fetchFromGitHub {
           owner = "afonso360";
@@ -7509,6 +7804,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "build-status";
+        ename = "build-status";
         version = "20171111.1147";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -7535,6 +7831,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bundler";
+        ename = "bundler";
         version = "20160815.215";
         src = fetchFromGitHub {
           owner = "tobiassvn";
@@ -7559,6 +7856,7 @@
                                                , melpaBuild }:
       melpaBuild {
         pname = "bury-successful-compilation";
+        ename = "bury-successful-compilation";
         version = "20150328.1728";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -7583,6 +7881,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buster-mode";
+        ename = "buster-mode";
         version = "20140928.513";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -7608,6 +7907,7 @@
                                    , yasnippet }:
       melpaBuild {
         pname = "buster-snippets";
+        ename = "buster-snippets";
         version = "20151125.210";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -7632,6 +7932,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "busybee-theme";
+        ename = "busybee-theme";
         version = "20170719.228";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -7659,6 +7960,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "butler";
+        ename = "butler";
         version = "20150811.1708";
         src = fetchFromGitHub {
           owner = "AshtonKem";
@@ -7683,6 +7985,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "buttercup";
+        ename = "buttercup";
         version = "20180629.523";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -7707,6 +8010,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "button-lock";
+        ename = "button-lock";
         version = "20150223.554";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -7731,6 +8035,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "c-c-combo";
+        ename = "c-c-combo";
         version = "20151223.1855";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -7755,6 +8060,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "c-eldoc";
+        ename = "c-eldoc";
         version = "20170917.1502";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -7779,6 +8085,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "c0-mode";
+        ename = "c0-mode";
         version = "20151110.1052";
         src = fetchFromGitHub {
           owner = "catern";
@@ -7805,6 +8112,7 @@
                                 , seq }:
       melpaBuild {
         pname = "cabledolphin";
+        ename = "cabledolphin";
         version = "20160204.138";
         src = fetchFromGitHub {
           owner = "legoscia";
@@ -7829,6 +8137,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "cache";
+        ename = "cache";
         version = "20111019.1600";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -7854,6 +8163,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "cacoo";
+        ename = "cacoo";
         version = "20120319.1659";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -7879,6 +8189,7 @@
                                   , s }:
       melpaBuild {
         pname = "cake-inflector";
+        ename = "cake-inflector";
         version = "20140415.158";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -7904,6 +8215,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cakecrumbs";
+        ename = "cakecrumbs";
         version = "20180222.1845";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -7929,6 +8241,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cal-china-x";
+        ename = "cal-china-x";
         version = "20180211.1101";
         src = fetchFromGitHub {
           owner = "xwl";
@@ -7953,6 +8266,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "calendar-norway";
+        ename = "calendar-norway";
         version = "20160827.1316";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -7977,6 +8291,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "calfw";
+        ename = "calfw";
         version = "20180117.1645";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8001,6 +8316,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "calfw-cal";
+        ename = "calfw-cal";
         version = "20170320.506";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8025,6 +8341,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "calfw-gcal";
+        ename = "calfw-gcal";
         version = "20120111.200";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -8049,6 +8366,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "calfw-howm";
+        ename = "calfw-howm";
         version = "20170703.1704";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8073,6 +8391,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "calfw-ical";
+        ename = "calfw-ical";
         version = "20150703.119";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8097,6 +8416,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "calfw-org";
+        ename = "calfw-org";
         version = "20160302.1858";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8126,6 +8446,7 @@
                               , tree-mode }:
       melpaBuild {
         pname = "call-graph";
+        ename = "call-graph";
         version = "20180509.635";
         src = fetchFromGitHub {
           owner = "beacoder";
@@ -8150,6 +8471,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "calmer-forest-theme";
+        ename = "calmer-forest-theme";
         version = "20130925.2210";
         src = fetchFromGitHub {
           owner = "caldwell";
@@ -8177,6 +8499,7 @@
                              , names }:
       melpaBuild {
         pname = "camcorder";
+        ename = "camcorder";
         version = "20160404.2134";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -8201,6 +8524,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "caml";
+        ename = "caml";
         version = "20171209.1232";
         src = fetchFromGitHub {
           owner = "ocaml";
@@ -8225,6 +8549,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "capture";
+        ename = "capture";
         version = "20130828.944";
         src = fetchFromGitHub {
           owner = "pashinin";
@@ -8251,6 +8576,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "carbon-now-sh";
+        ename = "carbon-now-sh";
         version = "20180331.1035";
         src = fetchFromGitHub {
           owner = "veelenga";
@@ -8278,6 +8604,7 @@
                          , rust-mode }:
       melpaBuild {
         pname = "cargo";
+        ename = "cargo";
         version = "20180521.408";
         src = fetchFromGitHub {
           owner = "kwrooijen";
@@ -8303,6 +8630,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "caroline-theme";
+        ename = "caroline-theme";
         version = "20160317.2220";
         src = fetchFromGitHub {
           owner = "xjackk";
@@ -8331,6 +8659,7 @@
                               , s }:
       melpaBuild {
         pname = "caseformat";
+        ename = "caseformat";
         version = "20160115.815";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -8362,6 +8691,7 @@
                         , shut-up }:
       melpaBuild {
         pname = "cask";
+        ename = "cask";
         version = "20180626.1249";
         src = fetchFromGitHub {
           owner = "cask";
@@ -8387,6 +8717,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cask-mode";
+        ename = "cask-mode";
         version = "20160410.749";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -8419,6 +8750,7 @@
                                         , shut-up }:
       melpaBuild {
         pname = "cask-package-toolset";
+        ename = "cask-package-toolset";
         version = "20170921.1556";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -8445,6 +8777,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "caskxy";
+        ename = "caskxy";
         version = "20140513.839";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -8470,6 +8803,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "catmacs";
+        ename = "catmacs";
         version = "20170826.457";
         src = fetchgit {
           url = "https://bitbucket.org/pymaximus/catmacs";
@@ -8494,6 +8828,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "cbm";
+        ename = "cbm";
         version = "20171116.440";
         src = fetchFromGitHub {
           owner = "akermu";
@@ -8518,6 +8853,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ccc";
+        ename = "ccc";
         version = "20151205.543";
         src = fetchFromGitHub {
           owner = "skk-dev";
@@ -8545,6 +8881,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ccls";
+        ename = "ccls";
         version = "20180708.2207";
         src = fetchFromGitHub {
           owner = "MaskRay";
@@ -8569,6 +8906,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cd-compile";
+        ename = "cd-compile";
         version = "20141108.1157";
         src = fetchFromGitHub {
           owner = "jamienicol";
@@ -8593,6 +8931,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "cdb";
+        ename = "cdb";
         version = "20151205.543";
         src = fetchFromGitHub {
           owner = "skk-dev";
@@ -8617,6 +8956,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cdlatex";
+        ename = "cdlatex";
         version = "20140707.426";
         src = fetchFromGitHub {
           owner = "cdominik";
@@ -8645,6 +8985,7 @@
                          , pkg-info }:
       melpaBuild {
         pname = "cdnjs";
+        ename = "cdnjs";
         version = "20161031.822";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -8669,6 +9010,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "cedit";
+        ename = "cedit";
         version = "20141231.814";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -8697,6 +9039,7 @@
                           , s }:
       melpaBuild {
         pname = "celery";
+        ename = "celery";
         version = "20170225.124";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -8722,6 +9065,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "celestial-mode-line";
+        ename = "celestial-mode-line";
         version = "20180518.122";
         src = fetchFromGitHub {
           owner = "ecraven";
@@ -8746,6 +9090,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "centered-cursor-mode";
+        ename = "centered-cursor-mode";
         version = "20180112.755";
         src = fetchFromGitHub {
           owner = "andre-r";
@@ -8771,6 +9116,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "centered-window";
+        ename = "centered-window";
         version = "20171127.149";
         src = fetchFromGitHub {
           owner = "anler";
@@ -8795,6 +9141,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "centimacro";
+        ename = "centimacro";
         version = "20140306.627";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -8822,6 +9169,7 @@
                            , s }:
       melpaBuild {
         pname = "cerbere";
+        ename = "cerbere";
         version = "20140418.715";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -8847,6 +9195,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ceylon-mode";
+        ename = "ceylon-mode";
         version = "20180606.624";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
@@ -8871,6 +9220,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "cfengine-code-style";
+        ename = "cfengine-code-style";
         version = "20171115.1308";
         src = fetchFromGitHub {
           owner = "cfengine";
@@ -8897,6 +9247,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "cff";
+        ename = "cff";
         version = "20160118.1218";
         src = fetchFromGitHub {
           owner = "fourier";
@@ -8924,6 +9275,7 @@
                              , mmm-mode }:
       melpaBuild {
         pname = "cfml-mode";
+        ename = "cfml-mode";
         version = "20170903.1949";
         src = fetchFromGitHub {
           owner = "am2605";
@@ -8951,6 +9303,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "cframe";
+        ename = "cframe";
         version = "20170917.1509";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -8976,6 +9329,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cftag-mode";
+        ename = "cftag-mode";
         version = "20170811.2240";
         src = fetchFromGitHub {
           owner = "am2605";
@@ -9000,6 +9354,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "cg";
+        ename = "cg";
         version = "20171123.301";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -9025,6 +9380,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "challenger-deep-theme";
+        ename = "challenger-deep-theme";
         version = "20180525.918";
         src = fetchFromGitHub {
           owner = "MaxSt";
@@ -9050,6 +9406,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "change-inner";
+        ename = "change-inner";
         version = "20150707.844";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -9074,6 +9431,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "chapel-mode";
+        ename = "chapel-mode";
         version = "20160504.108";
         src = fetchFromGitHub {
           owner = "russel";
@@ -9100,6 +9458,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "char-menu";
+        ename = "char-menu";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -9124,6 +9483,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "charmap";
+        ename = "charmap";
         version = "20160309.146";
         src = fetchFromGitHub {
           owner = "lateau";
@@ -9148,6 +9508,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "chatwork";
+        ename = "chatwork";
         version = "20170510.2142";
         src = fetchFromGitHub {
           owner = "ataka";
@@ -9173,6 +9534,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cheat-sh";
+        ename = "cheat-sh";
         version = "20170802.418";
         src = fetchFromGitHub {
           owner = "davep";
@@ -9199,6 +9561,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cheatsheet";
+        ename = "cheatsheet";
         version = "20170126.1350";
         src = fetchFromGitHub {
           owner = "darksmile";
@@ -9225,6 +9588,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "checkbox";
+        ename = "checkbox";
         version = "20141116.1658";
         src = fetchFromGitHub {
           owner = "camdez";
@@ -9252,6 +9616,7 @@
                         , s }:
       melpaBuild {
         pname = "chee";
+        ename = "chee";
         version = "20171123.1433";
         src = fetchFromGitHub {
           owner = "eikek";
@@ -9277,6 +9642,7 @@
                              , xelb }:
       melpaBuild {
         pname = "cheerilee";
+        ename = "cheerilee";
         version = "20160313.1135";
         src = fetchFromGitHub {
           owner = "Vannil";
@@ -9301,6 +9667,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "chef-mode";
+        ename = "chef-mode";
         version = "20180628.753";
         src = fetchFromGitHub {
           owner = "mpasternacki";
@@ -9326,6 +9693,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "cherry-blossom-theme";
+        ename = "cherry-blossom-theme";
         version = "20150621.2042";
         src = fetchFromGitHub {
           owner = "inlinestyle";
@@ -9350,6 +9718,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "chicken-scheme";
+        ename = "chicken-scheme";
         version = "20141116.1139";
         src = fetchFromGitHub {
           owner = "dleslie";
@@ -9375,6 +9744,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "chinese-conv";
+        ename = "chinese-conv";
         version = "20170807.1428";
         src = fetchFromGitHub {
           owner = "gucong";
@@ -9399,6 +9769,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "chinese-number";
+        ename = "chinese-number";
         version = "20161007.2209";
         src = fetchFromGitHub {
           owner = "zhcosin";
@@ -9423,6 +9794,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "chinese-wbim";
+        ename = "chinese-wbim";
         version = "20150623.2050";
         src = fetchFromGitHub {
           owner = "zilongshanren";
@@ -9448,6 +9820,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "chinese-word-at-point";
+        ename = "chinese-word-at-point";
         version = "20170811.241";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -9474,6 +9847,7 @@
                                   , pyim }:
       melpaBuild {
         pname = "chinese-yasdcv";
+        ename = "chinese-yasdcv";
         version = "20171014.1844";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -9500,6 +9874,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "choice-program";
+        ename = "choice-program";
         version = "20171004.931";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -9524,6 +9899,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "chronos";
+        ename = "chronos";
         version = "20150602.829";
         src = fetchFromGitHub {
           owner = "dxknight";
@@ -9549,6 +9925,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "chruby";
+        ename = "chruby";
         version = "20180114.852";
         src = fetchFromGitHub {
           owner = "plexus";
@@ -9573,6 +9950,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "chyla-theme";
+        ename = "chyla-theme";
         version = "20180302.858";
         src = fetchFromGitHub {
           owner = "chyla";
@@ -9604,12 +9982,13 @@
                          , spinner }:
       melpaBuild {
         pname = "cider";
-        version = "20180714.811";
+        ename = "cider";
+        version = "20180719.542";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "34046a9549c4a83d47466263166367ec4a2d7007";
-          sha256 = "0z73ngbk8l7ypkhnr0nxl4bbkw80rcfanxckxnpsdcxk1469cldx";
+          rev = "4b7aea3523fb91e8172dfdd538b01da8c0d7686f";
+          sha256 = "0lcczp066lxpq5s4f23bsvn15lkzivw6f0xi5ih7kf74c1fq1nn2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -9638,6 +10017,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "cider-decompile";
+        ename = "cider-decompile";
         version = "20151121.2137";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -9665,6 +10045,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "cider-eval-sexp-fu";
+        ename = "cider-eval-sexp-fu";
         version = "20160907.100";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -9691,6 +10072,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cider-hydra";
+        ename = "cider-hydra";
         version = "20161018.2254";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -9720,6 +10102,7 @@
                              , noflet }:
       melpaBuild {
         pname = "cider-spy";
+        ename = "cider-spy";
         version = "20160313.740";
         src = fetchFromGitHub {
           owner = "jonpither";
@@ -9745,6 +10128,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ciel";
+        ename = "ciel";
         version = "20170330.526";
         src = fetchFromGitHub {
           owner = "cs14095";
@@ -9769,6 +10153,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cil-mode";
+        ename = "cil-mode";
         version = "20160622.730";
         src = fetchFromGitHub {
           owner = "ForNeVeR";
@@ -9797,6 +10182,7 @@
                             , python-environment }:
       melpaBuild {
         pname = "cinspect";
+        ename = "cinspect";
         version = "20150715.1933";
         src = fetchFromGitHub {
           owner = "inlinestyle";
@@ -9822,6 +10208,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "circadian";
+        ename = "circadian";
         version = "20180708.643";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
@@ -9847,6 +10234,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "circe";
+        ename = "circe";
         version = "20180525.531";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -9874,6 +10262,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "circe-notifications";
+        ename = "circe-notifications";
         version = "20180102.1518";
         src = fetchFromGitHub {
           owner = "eqyiel";
@@ -9905,6 +10294,7 @@
                             , string-inflection }:
       melpaBuild {
         pname = "citeproc";
+        ename = "citeproc";
         version = "20180429.57";
         src = fetchFromGitHub {
           owner = "andras-simonyi";
@@ -9929,6 +10319,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cl-format";
+        ename = "cl-format";
         version = "20160412.1745";
         src = fetchFromGitHub {
           owner = "alvinfrancis";
@@ -9954,6 +10345,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "cl-lib-highlight";
+        ename = "cl-lib-highlight";
         version = "20140127.1312";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -9979,6 +10371,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "clang-format";
+        ename = "clang-format";
         version = "20180406.814";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -10003,6 +10396,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "clean-aindent-mode";
+        ename = "clean-aindent-mode";
         version = "20171017.1343";
         src = fetchFromGitHub {
           owner = "pmarinov";
@@ -10028,6 +10422,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "clean-buffers";
+        ename = "clean-buffers";
         version = "20160529.1559";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -10052,6 +10447,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "clear-text";
+        ename = "clear-text";
         version = "20160406.1343";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -10076,6 +10472,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "clevercss";
+        ename = "clevercss";
         version = "20131228.1755";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -10101,6 +10498,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "click-mode";
+        ename = "click-mode";
         version = "20180610.1744";
         src = fetchFromGitHub {
           owner = "bmalehorn";
@@ -10127,6 +10525,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cliphist";
+        ename = "cliphist";
         version = "20171112.2138";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -10151,6 +10550,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "clipmon";
+        ename = "clipmon";
         version = "20180129.254";
         src = fetchFromGitHub {
           owner = "bburns";
@@ -10176,6 +10576,7 @@
                           , pos-tip }:
       melpaBuild {
         pname = "clippy";
+        ename = "clippy";
         version = "20161028.1254";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -10200,6 +10601,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "clips-mode";
+        ename = "clips-mode";
         version = "20170909.123";
         src = fetchFromGitHub {
           owner = "grettke";
@@ -10235,6 +10637,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "clj-refactor";
+        ename = "clj-refactor";
         version = "20180708.57";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -10274,6 +10677,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cljr-helm";
+        ename = "cljr-helm";
         version = "20160913.128";
         src = fetchFromGitHub {
           owner = "philjackson";
@@ -10298,6 +10702,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "cljsbuild-mode";
+        ename = "cljsbuild-mode";
         version = "20160402.1000";
         src = fetchFromGitHub {
           owner = "kototama";
@@ -10322,6 +10727,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "clmemo";
+        ename = "clmemo";
         version = "20160326.923";
         src = fetchFromGitHub {
           owner = "ataka";
@@ -10347,6 +10753,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "cloc";
+        ename = "cloc";
         version = "20170728.1124";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -10373,6 +10780,7 @@
                            , projectile }:
       melpaBuild {
         pname = "clocker";
+        ename = "clocker";
         version = "20160125.1505";
         src = fetchFromGitHub {
           owner = "roman";
@@ -10398,6 +10806,7 @@
                            , request-deferred }:
       melpaBuild {
         pname = "clojars";
+        ename = "clojars";
         version = "20161109.1448";
         src = fetchFromGitHub {
           owner = "joshuamiller";
@@ -10424,6 +10833,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "clojure-cheatsheet";
+        ename = "clojure-cheatsheet";
         version = "20180201.4";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -10449,6 +10859,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "clojure-mode";
+        ename = "clojure-mode";
         version = "20180709.648";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -10474,6 +10885,7 @@
                                                    , melpaBuild }:
       melpaBuild {
         pname = "clojure-mode-extra-font-locking";
+        ename = "clojure-mode-extra-font-locking";
         version = "20180114.911";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -10500,6 +10912,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "clojure-quick-repls";
+        ename = "clojure-quick-repls";
         version = "20150814.36";
         src = fetchFromGitHub {
           owner = "symfrog";
@@ -10525,6 +10938,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "clojure-snippets";
+        ename = "clojure-snippets";
         version = "20180314.608";
         src = fetchFromGitHub {
           owner = "mpenet";
@@ -10553,12 +10967,13 @@
                            , simple-httpd }:
       melpaBuild {
         pname = "clomacs";
-        version = "20180713.340";
+        ename = "clomacs";
+        version = "20180722.757";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "047fc3c282c0edb198982987fc816c89313e367c";
-          sha256 = "1prkp96r5an9w23sc06png1gik35431sqvhmbl5xv2bx2xkwxpkq";
+          rev = "be07dc637553b86b6d5cfbbe7dcb4acaf897135e";
+          sha256 = "0h05424xfj3higzjrigzkgmp7pal8zivgjy8kfndj2sjy5kyz5g9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -10579,6 +10994,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "closql";
+        ename = "closql";
         version = "20180627.1931";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -10603,6 +11019,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "closure-lint-mode";
+        ename = "closure-lint-mode";
         version = "20101118.1324";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -10627,6 +11044,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "cloud-to-butt-erc";
+        ename = "cloud-to-butt-erc";
         version = "20130627.1608";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -10652,6 +11070,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "clues-theme";
+        ename = "clues-theme";
         version = "20161213.327";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -10677,6 +11096,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cm-mode";
+        ename = "cm-mode";
         version = "20170203.1307";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -10702,6 +11122,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "cmake-font-lock";
+        ename = "cmake-font-lock";
         version = "20170117.1225";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -10731,6 +11152,7 @@
                              , seq }:
       melpaBuild {
         pname = "cmake-ide";
+        ename = "cmake-ide";
         version = "20180713.813";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -10755,6 +11177,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cmake-mode";
+        ename = "cmake-mode";
         version = "20180709.726";
         src = fetchFromGitHub {
           owner = "Kitware";
@@ -10779,6 +11202,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "cmake-project";
+        ename = "cmake-project";
         version = "20171121.315";
         src = fetchFromGitHub {
           owner = "alamaison";
@@ -10806,6 +11230,7 @@
                                , shell-split-string }:
       melpaBuild {
         pname = "cmd-to-echo";
+        ename = "cmd-to-echo";
         version = "20161203.1333";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -10830,6 +11255,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cmm-mode";
+        ename = "cmm-mode";
         version = "20150224.2346";
         src = fetchFromGitHub {
           owner = "bgamari";
@@ -10855,6 +11281,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cnfonts";
+        ename = "cnfonts";
         version = "20171205.111";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -10880,6 +11307,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "cobalt";
+        ename = "cobalt";
         version = "20180304.355";
         src = fetchFromGitHub {
           owner = "cobalt-org";
@@ -10904,6 +11332,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cobra-mode";
+        ename = "cobra-mode";
         version = "20140116.1316";
         src = fetchFromGitHub {
           owner = "Nekroze";
@@ -10929,6 +11358,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "code-archive";
+        ename = "code-archive";
         version = "20180705.1913";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -10954,6 +11384,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "code-library";
+        ename = "code-library";
         version = "20160426.518";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -10978,6 +11409,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "codebug";
+        ename = "codebug";
         version = "20140929.1437";
         src = fetchFromGitHub {
           owner = "shano";
@@ -11003,6 +11435,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "codesearch";
+        ename = "codesearch";
         version = "20180508.822";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -11029,6 +11462,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "codic";
+        ename = "codic";
         version = "20150926.427";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -11054,6 +11488,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "coffee-fof";
+        ename = "coffee-fof";
         version = "20131012.530";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -11079,6 +11514,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "coffee-mode";
+        ename = "coffee-mode";
         version = "20170324.240";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -11105,6 +11541,7 @@
                                , request }:
       melpaBuild {
         pname = "coin-ticker";
+        ename = "coin-ticker";
         version = "20170611.27";
         src = fetchFromGitHub {
           owner = "eklitzke";
@@ -11130,6 +11567,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "colemak-evil";
+        ename = "colemak-evil";
         version = "20171015.1607";
         src = fetchFromGitHub {
           owner = "patbl";
@@ -11155,6 +11593,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "colonoscopy-theme";
+        ename = "colonoscopy-theme";
         version = "20170808.609";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -11181,6 +11620,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "color-identifiers-mode";
+        ename = "color-identifiers-mode";
         version = "20180504.926";
         src = fetchFromGitHub {
           owner = "ankurdave";
@@ -11205,6 +11645,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "color-moccur";
+        ename = "color-moccur";
         version = "20141222.1635";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -11229,6 +11670,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "color-theme";
+        ename = "color-theme";
         version = "20080305.34";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -11253,6 +11695,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "color-theme-approximate";
+        ename = "color-theme-approximate";
         version = "20140227.2036";
         src = fetchFromGitHub {
           owner = "tungd";
@@ -11278,6 +11721,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "color-theme-buffer-local";
+        ename = "color-theme-buffer-local";
         version = "20170125.2201";
         src = fetchFromGitHub {
           owner = "vic";
@@ -11303,6 +11747,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "color-theme-modern";
+        ename = "color-theme-modern";
         version = "20161219.344";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -11327,6 +11772,7 @@
                                                    , melpaBuild }:
       melpaBuild {
         pname = "color-theme-sanityinc-solarized";
+        ename = "color-theme-sanityinc-solarized";
         version = "20160429.1903";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -11351,6 +11797,7 @@
                                                   , melpaBuild }:
       melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
+        ename = "color-theme-sanityinc-tomorrow";
         version = "20180713.212";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -11376,6 +11823,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "color-theme-solarized";
+        ename = "color-theme-solarized";
         version = "20171024.825";
         src = fetchFromGitHub {
           owner = "sellout";
@@ -11401,6 +11849,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "color-theme-x";
+        ename = "color-theme-x";
         version = "20180226.1646";
         src = fetchFromGitHub {
           owner = "ajsquared";
@@ -11426,6 +11875,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "colormaps";
+        ename = "colormaps";
         version = "20171008.1524";
         src = fetchFromGitHub {
           owner = "lepisma";
@@ -11450,6 +11900,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "column-enforce-mode";
+        ename = "column-enforce-mode";
         version = "20171030.1200";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
@@ -11476,6 +11927,7 @@
                                 , s }:
       melpaBuild {
         pname = "com-css-sort";
+        ename = "com-css-sort";
         version = "20180607.1808";
         src = fetchFromGitHub {
           owner = "jcs090218";
@@ -11501,6 +11953,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "comint-intercept";
+        ename = "comint-intercept";
         version = "20170317.528";
         src = fetchFromGitHub {
           owner = "hying-caritas";
@@ -11525,6 +11978,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "command-log-mode";
+        ename = "command-log-mode";
         version = "20160412.2147";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -11550,6 +12004,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "command-queue";
+        ename = "command-queue";
         version = "20160328.1025";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
@@ -11578,6 +12033,7 @@
                              , s }:
       melpaBuild {
         pname = "commander";
+        ename = "commander";
         version = "20140120.1052";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -11602,6 +12058,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "comment-dwim-2";
+        ename = "comment-dwim-2";
         version = "20170809.1354";
         src = fetchFromGitHub {
           owner = "remyferre";
@@ -11627,6 +12084,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "comment-tags";
+        ename = "comment-tags";
         version = "20170910.1035";
         src = fetchFromGitHub {
           owner = "vincekd";
@@ -11653,6 +12111,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "commenter";
+        ename = "commenter";
         version = "20160219.827";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -11678,6 +12137,7 @@
                            , s }:
       melpaBuild {
         pname = "commify";
+        ename = "commify";
         version = "20161106.1534";
         src = fetchFromGitHub {
           owner = "ddoherty03";
@@ -11703,6 +12163,7 @@
                                         , yasnippet }:
       melpaBuild {
         pname = "common-lisp-snippets";
+        ename = "common-lisp-snippets";
         version = "20180226.723";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -11728,6 +12189,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "company";
+        ename = "company";
         version = "20180704.701";
         src = fetchFromGitHub {
           owner = "company-mode";
@@ -11757,6 +12219,7 @@
                                     , s }:
       melpaBuild {
         pname = "company-anaconda";
+        ename = "company-anaconda";
         version = "20180610.2321";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -11783,6 +12246,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "company-ansible";
+        ename = "company-ansible";
         version = "20180701.1113";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -11814,6 +12278,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "company-arduino";
+        ename = "company-arduino";
         version = "20160306.939";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -11849,6 +12314,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "company-auctex";
+        ename = "company-auctex";
         version = "20180330.1118";
         src = fetchFromGitHub {
           owner = "alexeyr";
@@ -11876,6 +12342,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-axiom";
+        ename = "company-axiom";
         version = "20171024.1310";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
@@ -11902,6 +12369,7 @@
                                   , parsebib }:
       melpaBuild {
         pname = "company-bibtex";
+        ename = "company-bibtex";
         version = "20171104.2344";
         src = fetchFromGitHub {
           owner = "gbgar";
@@ -11930,6 +12398,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-box";
+        ename = "company-box";
         version = "20180607.845";
         src = fetchFromGitHub {
           owner = "sebastiencs";
@@ -11956,6 +12425,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "company-c-headers";
+        ename = "company-c-headers";
         version = "20170531.1330";
         src = fetchFromGitHub {
           owner = "randomphrase";
@@ -11983,6 +12453,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-cabal";
+        ename = "company-cabal";
         version = "20170917.617";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -12009,6 +12480,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "company-childframe";
+        ename = "company-childframe";
         version = "20180704.2246";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -12038,6 +12510,7 @@
                                , yasnippet }:
       melpaBuild {
         pname = "company-coq";
+        ename = "company-coq";
         version = "20180307.510";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -12068,6 +12541,7 @@
                                , yasnippet }:
       melpaBuild {
         pname = "company-dcd";
+        ename = "company-dcd";
         version = "20170516.210";
         src = fetchFromGitHub {
           owner = "tsukimizake";
@@ -12102,6 +12576,7 @@
                                 , parent-mode }:
       melpaBuild {
         pname = "company-dict";
+        ename = "company-dict";
         version = "20180216.156";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -12127,6 +12602,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "company-distel";
+        ename = "company-distel";
         version = "20161002.2339";
         src = fetchFromGitHub {
           owner = "sebastiw";
@@ -12155,6 +12631,7 @@
                                 , s }:
       melpaBuild {
         pname = "company-edbi";
+        ename = "company-edbi";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -12182,6 +12659,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "company-emacs-eclim";
+        ename = "company-emacs-eclim";
         version = "20170104.743";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -12208,6 +12686,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-emoji";
+        ename = "company-emoji";
         version = "20161230.1937";
         src = fetchFromGitHub {
           owner = "dunn";
@@ -12235,6 +12714,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "company-erlang";
+        ename = "company-erlang";
         version = "20170122.2138";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -12261,6 +12741,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-flow";
+        ename = "company-flow";
         version = "20180225.1359";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -12288,6 +12769,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-flx";
+        ename = "company-flx";
         version = "20180102.2118";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -12316,6 +12798,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-ghc";
+        ename = "company-ghc";
         version = "20170918.133";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -12342,6 +12825,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-ghci";
+        ename = "company-ghci";
         version = "20160310.1800";
         src = fetchFromGitHub {
           owner = "juiko";
@@ -12369,6 +12853,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-glsl";
+        ename = "company-glsl";
         version = "20171015.1049";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
@@ -12395,6 +12880,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "company-go";
+        ename = "company-go";
         version = "20170825.943";
         src = fetchFromGitHub {
           owner = "nsf";
@@ -12422,6 +12908,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "company-inf-ruby";
+        ename = "company-inf-ruby";
         version = "20140805.1354";
         src = fetchFromGitHub {
           owner = "company-mode";
@@ -12450,6 +12937,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-irony";
+        ename = "company-irony";
         version = "20170905.1346";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -12477,6 +12965,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "company-irony-c-headers";
+        ename = "company-irony-c-headers";
         version = "20151018.209";
         src = fetchFromGitHub {
           owner = "hotpxl";
@@ -12505,6 +12994,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-jedi";
+        ename = "company-jedi";
         version = "20151216.1921";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -12536,6 +13026,7 @@
                                 , s }:
       melpaBuild {
         pname = "company-lean";
+        ename = "company-lean";
         version = "20171102.754";
         src = fetchFromGitHub {
           owner = "leanprover";
@@ -12565,6 +13056,7 @@
                                , s }:
       melpaBuild {
         pname = "company-lsp";
+        ename = "company-lsp";
         version = "20180617.1033";
         src = fetchFromGitHub {
           owner = "tigersoldier";
@@ -12593,6 +13085,7 @@
                                , s }:
       melpaBuild {
         pname = "company-lua";
+        ename = "company-lua";
         version = "20171108.1506";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -12619,6 +13112,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-math";
+        ename = "company-math";
         version = "20171016.814";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -12646,6 +13140,7 @@
                                        , nand2tetris }:
       melpaBuild {
         pname = "company-nand2tetris";
+        ename = "company-nand2tetris";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -12671,6 +13166,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-nginx";
+        ename = "company-nginx";
         version = "20180603.1702";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -12697,6 +13193,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-ngram";
+        ename = "company-ngram";
         version = "20170129.1113";
         src = fetchFromGitHub {
           owner = "kshramt";
@@ -12724,6 +13221,7 @@
                                          , nixos-options }:
       melpaBuild {
         pname = "company-nixos-options";
+        ename = "company-nixos-options";
         version = "20160215.57";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -12751,6 +13249,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-php";
+        ename = "company-php";
         version = "20180510.1500";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -12780,6 +13279,7 @@
                                    , s }:
       melpaBuild {
         pname = "company-plsense";
+        ename = "company-plsense";
         version = "20180117.1658";
         src = fetchFromGitHub {
           owner = "CeleritasCelery";
@@ -12806,6 +13306,7 @@
                                   , pollen-mode }:
       melpaBuild {
         pname = "company-pollen";
+        ename = "company-pollen";
         version = "20160812.810";
         src = fetchFromGitHub {
           owner = "lijunsong";
@@ -12833,6 +13334,7 @@
                                     , posframe }:
       melpaBuild {
         pname = "company-posframe";
+        ename = "company-posframe";
         version = "20180610.1010";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -12860,6 +13362,7 @@
                                      , prescient }:
       melpaBuild {
         pname = "company-prescient";
+        ename = "company-prescient";
         version = "20180626.1050";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -12886,6 +13389,7 @@
                                , qml-mode }:
       melpaBuild {
         pname = "company-qml";
+        ename = "company-qml";
         version = "20170428.1008";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -12913,6 +13417,7 @@
                                      , pos-tip }:
       melpaBuild {
         pname = "company-quickhelp";
+        ename = "company-quickhelp";
         version = "20180525.303";
         src = fetchFromGitHub {
           owner = "expez";
@@ -12941,6 +13446,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-racer";
+        ename = "company-racer";
         version = "20171204.1910";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -12968,6 +13474,7 @@
                                   , s }:
       melpaBuild {
         pname = "company-reftex";
+        ename = "company-reftex";
         version = "20180713.141";
         src = fetchFromGitHub {
           owner = "TheBB";
@@ -12997,6 +13504,7 @@
                                       , restclient }:
       melpaBuild {
         pname = "company-restclient";
+        ename = "company-restclient";
         version = "20151202.401";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -13030,6 +13538,7 @@
                                  , rtags }:
       melpaBuild {
         pname = "company-rtags";
+        ename = "company-rtags";
         version = "20170924.2244";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -13058,6 +13567,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-shell";
+        ename = "company-shell";
         version = "20170517.2241";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -13085,6 +13595,7 @@
                                     , solidity-mode }:
       melpaBuild {
         pname = "company-solidity";
+        ename = "company-solidity";
         version = "20180407.1344";
         src = fetchFromGitHub {
           owner = "ssmolkin1";
@@ -13114,6 +13625,7 @@
                                      , sourcekit }:
       melpaBuild {
         pname = "company-sourcekit";
+        ename = "company-sourcekit";
         version = "20170126.353";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -13140,6 +13652,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "company-statistics";
+        ename = "company-statistics";
         version = "20170210.1133";
         src = fetchFromGitHub {
           owner = "company-mode";
@@ -13166,6 +13679,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "company-suggest";
+        ename = "company-suggest";
         version = "20180527.931";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -13196,6 +13710,7 @@
                                 , tern }:
       melpaBuild {
         pname = "company-tern";
+        ename = "company-tern";
         version = "20161004.1147";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -13223,6 +13738,7 @@
                                      , terraform-mode }:
       melpaBuild {
         pname = "company-terraform";
+        ename = "company-terraform";
         version = "20180703.533";
         src = fetchFromGitHub {
           owner = "rafalcieslak";
@@ -13250,6 +13766,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "company-try-hard";
+        ename = "company-try-hard";
         version = "20150902.1506";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -13278,6 +13795,7 @@
                                , web-completion-data }:
       melpaBuild {
         pname = "company-web";
+        ename = "company-web";
         version = "20180402.455";
         src = fetchFromGitHub {
           owner = "osv";
@@ -13303,6 +13821,7 @@
                                , ycm }:
       melpaBuild {
         pname = "company-ycm";
+        ename = "company-ycm";
         version = "20140904.1117";
         src = fetchFromGitHub {
           owner = "neuromage";
@@ -13334,6 +13853,7 @@
                                 , ycmd }:
       melpaBuild {
         pname = "company-ycmd";
+        ename = "company-ycmd";
         version = "20180520.353";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -13359,6 +13879,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "composable";
+        ename = "composable";
         version = "20170723.2347";
         src = fetchFromGitHub {
           owner = "paldepind";
@@ -13389,6 +13910,7 @@
                             , seq }:
       melpaBuild {
         pname = "composer";
+        ename = "composer";
         version = "20180415.743";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -13415,6 +13937,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "concurrent";
+        ename = "concurrent";
         version = "20161228.1930";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -13444,6 +13967,7 @@
                          , s }:
       melpaBuild {
         pname = "conda";
+        ename = "conda";
         version = "20171122.716";
         src = fetchFromGitHub {
           owner = "necaris";
@@ -13468,6 +13992,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "config-general-mode";
+        ename = "config-general-mode";
         version = "20171024.1140";
         src = fetchFromGitHub {
           owner = "tlinden";
@@ -13493,6 +14018,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "config-parser";
+        ename = "config-parser";
         version = "20160426.519";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -13518,6 +14044,7 @@
                               , xml-rpc }:
       melpaBuild {
         pname = "confluence";
+        ename = "confluence";
         version = "20151020.1828";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -13542,6 +14069,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "conkeror-minor-mode";
+        ename = "conkeror-minor-mode";
         version = "20150114.804";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -13569,12 +14097,13 @@
                                , parsec }:
       melpaBuild {
         pname = "conllu-mode";
-        version = "20180304.637";
+        ename = "conllu-mode";
+        version = "20180722.454";
         src = fetchFromGitHub {
           owner = "odanoburu";
           repo = "conllu-mode";
-          rev = "5c1f4de04d5cba9ff4fc3246c507f74f50a2aa6c";
-          sha256 = "0zr8pglciqc1af06qsvqjks823wbb7s33g3qvhajxlfcz10iyd98";
+          rev = "fa2769b010c6e600711a04f083d1573505c61c2e";
+          sha256 = "16hasrrsz566bpr4xcjmby3hxf4ad2msb9bx8cs6fndvxgy1zvyk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
@@ -13593,6 +14122,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "connection";
+        ename = "connection";
         version = "20140717.2029";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -13620,6 +14150,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "contextual";
+        ename = "contextual";
         version = "20160131.1037";
         src = fetchFromGitHub {
           owner = "lshift-de";
@@ -13644,6 +14175,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "contextual-menubar";
+        ename = "contextual-menubar";
         version = "20180204.2309";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -13670,6 +14202,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "contrast-color";
+        ename = "contrast-color";
         version = "20160903.1107";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -13694,6 +14227,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "control-mode";
+        ename = "control-mode";
         version = "20160624.1010";
         src = fetchFromGitHub {
           owner = "stephendavidmarsh";
@@ -13719,6 +14253,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "copy-as-format";
+        ename = "copy-as-format";
         version = "20171215.1616";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -13747,6 +14282,7 @@
                                      , s }:
       melpaBuild {
         pname = "copy-file-on-save";
+        ename = "copy-file-on-save";
         version = "20180604.719";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -13774,6 +14310,7 @@
                           , s }:
       melpaBuild {
         pname = "copyit";
+        ename = "copyit";
         version = "20161126.429";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -13801,6 +14338,7 @@
                                  , pandoc }:
       melpaBuild {
         pname = "copyit-pandoc";
+        ename = "copyit-pandoc";
         version = "20160624.1328";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -13828,6 +14366,7 @@
                                  , s }:
       melpaBuild {
         pname = "coq-commenter";
+        ename = "coq-commenter";
         version = "20170822.1609";
         src = fetchFromGitHub {
           owner = "ailrun";
@@ -13852,6 +14391,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "corral";
+        ename = "corral";
         version = "20160502.1";
         src = fetchFromGitHub {
           owner = "nivekuil";
@@ -13877,6 +14417,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "cosmo";
+        ename = "cosmo";
         version = "20170922.44";
         src = fetchFromGitLab {
           owner = "montanari";
@@ -13903,12 +14444,13 @@
                            , swiper }:
       melpaBuild {
         pname = "counsel";
-        version = "20180713.946";
+        ename = "counsel";
+        version = "20180719.1303";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
-          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
+          rev = "89bae2f783918609c074f7c594dcc19ce19b8d45";
+          sha256 = "0a2r5x7la9hx42wiyf5fjalb29r1ykr2r3q2lhgf6lc3h2qnrhmx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -13929,6 +14471,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "counsel-bbdb";
+        ename = "counsel-bbdb";
         version = "20171129.1737";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -13957,6 +14500,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "counsel-codesearch";
+        ename = "counsel-codesearch";
         version = "20180713.304";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -13984,6 +14528,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "counsel-css";
+        ename = "counsel-css";
         version = "20180302.236";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -14013,6 +14558,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "counsel-dash";
+        ename = "counsel-dash";
         version = "20160729.829";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -14039,6 +14585,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-etags";
+        ename = "counsel-etags";
         version = "20180605.613";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -14065,6 +14612,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-gtags";
+        ename = "counsel-gtags";
         version = "20170326.559";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -14093,6 +14641,7 @@
                                    , s }:
       melpaBuild {
         pname = "counsel-notmuch";
+        ename = "counsel-notmuch";
         version = "20180713.1740";
         src = fetchFromGitHub {
           owner = "fuxialexander";
@@ -14119,6 +14668,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "counsel-org-capture-string";
+        ename = "counsel-org-capture-string";
         version = "20180707.217";
         src = fetchFromGitHub {
           owner = "akirak";
@@ -14146,6 +14696,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "counsel-org-clock";
+        ename = "counsel-org-clock";
         version = "20180623.617";
         src = fetchFromGitHub {
           owner = "akirak";
@@ -14172,6 +14723,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "counsel-osx-app";
+        ename = "counsel-osx-app";
         version = "20160821.109";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -14198,12 +14750,13 @@
                                       , projectile }:
       melpaBuild {
         pname = "counsel-projectile";
-        version = "20180713.228";
+        ename = "counsel-projectile";
+        version = "20180718.842";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "162f99881a9dce7d83668effb197c5e08fa12d5d";
-          sha256 = "1xb0rrsm47ip6ghgwbm33s67fq2lprkkj9assrzflc5ahdf71znx";
+          rev = "6ffcf45767543c72e817d9de8bca9db9156a48be";
+          sha256 = "1zdnw9n32fgrpwqkd2v153gdhyq183avr78hj57cq48hp6vfwfa1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -14224,6 +14777,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-pydoc";
+        ename = "counsel-pydoc";
         version = "20171018.1342";
         src = fetchFromGitHub {
           owner = "co-dh";
@@ -14250,6 +14804,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "counsel-spotify";
+        ename = "counsel-spotify";
         version = "20180319.2022";
         src = fetchFromGitHub {
           owner = "Lautaro-Garcia";
@@ -14276,6 +14831,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-tramp";
+        ename = "counsel-tramp";
         version = "20180311.2327";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -14302,6 +14858,7 @@
                                        , s }:
       melpaBuild {
         pname = "counsel-world-clock";
+        ename = "counsel-world-clock";
         version = "20171201.2337";
         src = fetchFromGitHub {
           owner = "kchenphy";
@@ -14330,6 +14887,7 @@
                        , s }:
       melpaBuild {
         pname = "cov";
+        ename = "cov";
         version = "20180415.1331";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -14356,6 +14914,7 @@
                             , ov }:
       melpaBuild {
         pname = "coverage";
+        ename = "coverage";
         version = "20180226.2057";
         src = fetchFromGitHub {
           owner = "trezona-lecomte";
@@ -14382,6 +14941,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "coverlay";
+        ename = "coverlay";
         version = "20180518.1555";
         src = fetchFromGitHub {
           owner = "twada";
@@ -14406,6 +14966,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cp5022x";
+        ename = "cp5022x";
         version = "20120323.1635";
         src = fetchFromGitHub {
           owner = "awasira";
@@ -14431,6 +14992,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "cpanfile-mode";
+        ename = "cpanfile-mode";
         version = "20161001.10";
         src = fetchFromGitHub {
           owner = "zakame";
@@ -14455,6 +15017,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "cpputils-cmake";
+        ename = "cpputils-cmake";
         version = "20170819.259";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -14480,6 +15043,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cql-mode";
+        ename = "cql-mode";
         version = "20160720.2039";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
@@ -14507,6 +15071,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "cquery";
+        ename = "cquery";
         version = "20180619.1953";
         src = fetchFromGitHub {
           owner = "cquery-project";
@@ -14531,6 +15096,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "crappy-jsp-mode";
+        ename = "crappy-jsp-mode";
         version = "20140311.231";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -14556,6 +15122,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "creamsody-theme";
+        ename = "creamsody-theme";
         version = "20170222.258";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -14582,6 +15149,7 @@
                          , s }:
       melpaBuild {
         pname = "creds";
+        ename = "creds";
         version = "20140510.1006";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -14608,6 +15176,7 @@
                           , noflet }:
       melpaBuild {
         pname = "creole";
+        ename = "creole";
         version = "20140924.800";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -14632,6 +15201,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "creole-mode";
+        ename = "creole-mode";
         version = "20130721.1750";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -14660,6 +15230,7 @@
                             , s }:
       melpaBuild {
         pname = "cricbuzz";
+        ename = "cricbuzz";
         version = "20171227.1607";
         src = fetchFromGitHub {
           owner = "lepisma";
@@ -14685,6 +15256,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "crm-custom";
+        ename = "crm-custom";
         version = "20160116.1606";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -14710,6 +15282,7 @@
                         , seq }:
       melpaBuild {
         pname = "crux";
+        ename = "crux";
         version = "20180611.2355";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -14734,6 +15307,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cryptol-mode";
+        ename = "cryptol-mode";
         version = "20180321.1108";
         src = fetchFromGitHub {
           owner = "thoughtpolice";
@@ -14759,6 +15333,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "cryptsy-public-api";
+        ename = "cryptsy-public-api";
         version = "20141008.528";
         src = fetchFromGitHub {
           owner = "Sodaware";
@@ -14784,6 +15359,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "crystal-mode";
+        ename = "crystal-mode";
         version = "20180606.755";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
@@ -14808,6 +15384,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "csgo-conf-mode";
+        ename = "csgo-conf-mode";
         version = "20161209.819";
         src = fetchFromGitHub {
           owner = "wynro";
@@ -14832,6 +15409,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "csharp-mode";
+        ename = "csharp-mode";
         version = "20180708.652";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -14859,6 +15437,7 @@
                                , shut-up }:
       melpaBuild {
         pname = "csound-mode";
+        ename = "csound-mode";
         version = "20180505.1225";
         src = fetchFromGitHub {
           owner = "hlolli";
@@ -14884,6 +15463,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "css-autoprefixer";
+        ename = "css-autoprefixer";
         version = "20180311.900";
         src = fetchFromGitHub {
           owner = "kkweon";
@@ -14908,6 +15488,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "css-comb";
+        ename = "css-comb";
         version = "20160415.2259";
         src = fetchFromGitHub {
           owner = "channikhabra";
@@ -14932,6 +15513,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "css-eldoc";
+        ename = "css-eldoc";
         version = "20150124.1923";
         src = fetchFromGitHub {
           owner = "zenozeng";
@@ -14956,6 +15538,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "cssh";
+        ename = "cssh";
         version = "20150810.1009";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -14980,6 +15563,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "csv";
+        ename = "csv";
         version = "20161113.710";
         src = fetchFromGitLab {
           owner = "u11";
@@ -15004,6 +15588,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ctable";
+        ename = "ctable";
         version = "20171005.1711";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -15028,6 +15613,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ctags-update";
+        ename = "ctags-update";
         version = "20170728.58";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -15052,6 +15638,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ctl-mode";
+        ename = "ctl-mode";
         version = "20151202.206";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -15079,6 +15666,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "ctxmenu";
+        ename = "ctxmenu";
         version = "20140303.1342";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -15105,6 +15693,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cubicaltt";
+        ename = "cubicaltt";
         version = "20171108.602";
         src = fetchFromGitHub {
           owner = "mortberg";
@@ -15129,6 +15718,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cubicle-mode";
+        ename = "cubicle-mode";
         version = "20171009.1257";
         src = fetchFromGitHub {
           owner = "cubicle-model-checker";
@@ -15154,6 +15744,7 @@
                                       , pcre2el }:
       melpaBuild {
         pname = "cucumber-goto-step";
+        ename = "cucumber-goto-step";
         version = "20131209.2119";
         src = fetchFromGitHub {
           owner = "gstamp";
@@ -15178,6 +15769,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cuda-mode";
+        ename = "cuda-mode";
         version = "20151213.1921";
         src = fetchFromGitHub {
           owner = "chachi";
@@ -15203,6 +15795,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cursor-test";
+        ename = "cursor-test";
         version = "20131207.932";
         src = fetchFromGitHub {
           owner = "ainame";
@@ -15229,6 +15822,7 @@
                             , yaml-mode }:
       melpaBuild {
         pname = "cwl-mode";
+        ename = "cwl-mode";
         version = "20171205.145";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -15253,6 +15847,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "cyberpunk-theme";
+        ename = "cyberpunk-theme";
         version = "20180608.2209";
         src = fetchFromGitHub {
           owner = "n3mo";
@@ -15277,6 +15872,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "cycbuf";
+        ename = "cycbuf";
         version = "20131203.1237";
         src = fetchFromGitHub {
           owner = "martinp26";
@@ -15301,6 +15897,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cycle-resize";
+        ename = "cycle-resize";
         version = "20160521.857";
         src = fetchFromGitHub {
           owner = "pierre-lecocq";
@@ -15326,6 +15923,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cycle-themes";
+        ename = "cycle-themes";
         version = "20150402.2009";
         src = fetchFromGitHub {
           owner = "toroidal-code";
@@ -15351,6 +15949,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cyphejor";
+        ename = "cyphejor";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -15375,6 +15974,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cypher-mode";
+        ename = "cypher-mode";
         version = "20151110.342";
         src = fetchFromGitHub {
           owner = "fxbois";
@@ -15399,6 +15999,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cython-mode";
+        ename = "cython-mode";
         version = "20180213.854";
         src = fetchFromGitHub {
           owner = "cython";
@@ -15423,6 +16024,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "czech-holidays";
+        ename = "czech-holidays";
         version = "20160113.952";
         src = fetchFromGitHub {
           owner = "hydandata";
@@ -15448,6 +16050,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "d-mode";
+        ename = "d-mode";
         version = "20180502.710";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
@@ -15472,6 +16075,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dactyl-mode";
+        ename = "dactyl-mode";
         version = "20140906.1025";
         src = fetchFromGitHub {
           owner = "luxbock";
@@ -15497,6 +16101,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dad-joke";
+        ename = "dad-joke";
         version = "20170927.2358";
         src = fetchFromGitHub {
           owner = "davep";
@@ -15522,6 +16127,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "daemons";
+        ename = "daemons";
         version = "20180610.810";
         src = fetchFromGitHub {
           owner = "cbowdon";
@@ -15546,6 +16152,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "dakrone-light-theme";
+        ename = "dakrone-light-theme";
         version = "20170808.1440";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -15570,6 +16177,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dakrone-theme";
+        ename = "dakrone-theme";
         version = "20170801.1233";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -15594,6 +16202,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "danneskjold-theme";
+        ename = "danneskjold-theme";
         version = "20180708.724";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
@@ -15625,6 +16234,7 @@
                          , s }:
       melpaBuild {
         pname = "dante";
+        ename = "dante";
         version = "20180515.1312";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -15649,6 +16259,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "darcsum";
+        ename = "darcsum";
         version = "20140315.2110";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -15673,6 +16284,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "darcula-theme";
+        ename = "darcula-theme";
         version = "20171227.1045";
         src = fetchFromGitLab {
           owner = "fommil";
@@ -15698,6 +16310,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "dark-krystal-theme";
+        ename = "dark-krystal-theme";
         version = "20170808.600";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -15722,6 +16335,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "dark-mint-theme";
+        ename = "dark-mint-theme";
         version = "20160301.2242";
         src = fetchFromGitHub {
           owner = "shaunvxc";
@@ -15746,6 +16360,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dark-souls";
+        ename = "dark-souls";
         version = "20140314.428";
         src = fetchFromGitHub {
           owner = "tomjakubowski";
@@ -15770,6 +16385,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "darkburn-theme";
+        ename = "darkburn-theme";
         version = "20170423.952";
         src = fetchFromGitHub {
           owner = "gorauskas";
@@ -15794,6 +16410,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "darkmine-theme";
+        ename = "darkmine-theme";
         version = "20160405.2324";
         src = fetchFromGitHub {
           owner = "pierre-lecocq";
@@ -15818,6 +16435,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "darkokai-theme";
+        ename = "darkokai-theme";
         version = "20180513.1857";
         src = fetchFromGitHub {
           owner = "sjrmanning";
@@ -15843,12 +16461,13 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "darktooth-theme";
-        version = "20180612.1814";
+        ename = "darktooth-theme";
+        version = "20180721.2039";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "98f909497710ff948c996c810ca1bddf1f8b91d8";
-          sha256 = "0420hx95rriyyfjn0kpy39g63j0jn7x5zqyb3l6kwj5g3nrjlz26";
+          rev = "6060fe63e407fbd08a3acf8af05bdc6ea0bd422e";
+          sha256 = "1y7kjfjxj560chb5rh4rs9x3k2z20vc5vbg974a1aj37ipla4qlb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -15872,12 +16491,13 @@
                              , s }:
       melpaBuild {
         pname = "dart-mode";
-        version = "20180604.835";
+        ename = "dart-mode";
+        version = "20180721.2225";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "d4da484bce718fd9d9d442d9e4346c0d5c1e06cf";
-          sha256 = "11b4v37qcx6riq1yr6wg8m34a4skx16n3j51llrqsv5a1a0ajbwq";
+          rev = "9c9a63ed7bbf2b9d3521ead8c302489789552f9d";
+          sha256 = "12izfp7516d201shnj0fgd4g9ca2ji2rigiifz7bp0ysmbbpy8nr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -15896,6 +16516,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "dash";
+        ename = "dash";
         version = "20180413.30";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -15920,6 +16541,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dash-at-point";
+        ename = "dash-at-point";
         version = "20180710.656";
         src = fetchFromGitHub {
           owner = "stanaka";
@@ -15946,6 +16568,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "dash-functional";
+        ename = "dash-functional";
         version = "20180107.818";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -15972,6 +16595,7 @@
                              , page-break-lines }:
       melpaBuild {
         pname = "dashboard";
+        ename = "dashboard";
         version = "20180704.2325";
         src = fetchFromGitHub {
           owner = "rakanalh";
@@ -15996,6 +16620,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "date-at-point";
+        ename = "date-at-point";
         version = "20150308.543";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -16023,6 +16648,7 @@
                               , yaxception }:
       melpaBuild {
         pname = "date-field";
+        ename = "date-field";
         version = "20141128.1705";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -16049,6 +16675,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "datetime";
+        ename = "datetime";
         version = "20180325.1004";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -16073,6 +16700,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "datetime-format";
+        ename = "datetime-format";
         version = "20160612.1015";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -16100,6 +16728,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "datomic-snippets";
+        ename = "datomic-snippets";
         version = "20180116.752";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -16127,6 +16756,7 @@
                           , uuid }:
       melpaBuild {
         pname = "dayone";
+        ename = "dayone";
         version = "20160105.440";
         src = fetchFromGitHub {
           owner = "mori-dev";
@@ -16152,6 +16782,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "db";
+        ename = "db";
         version = "20140421.1411";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -16178,6 +16809,7 @@
                          , pg }:
       melpaBuild {
         pname = "db-pg";
+        ename = "db-pg";
         version = "20130131.1102";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -16204,6 +16836,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "ddskk";
+        ename = "ddskk";
         version = "20180706.2232";
         src = fetchFromGitHub {
           owner = "skk-dev";
@@ -16233,6 +16866,7 @@
                             , spinner }:
       melpaBuild {
         pname = "deadgrep";
+        ename = "deadgrep";
         version = "20180714.1716";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -16258,6 +16892,7 @@
                             , xml-rpc }:
       melpaBuild {
         pname = "debpaste";
+        ename = "debpaste";
         version = "20160113.1547";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -16283,6 +16918,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "debug-print";
+        ename = "debug-print";
         version = "20140125.1619";
         src = fetchFromGitHub {
           owner = "kenoss";
@@ -16307,6 +16943,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "decide";
+        ename = "decide";
         version = "20180316.1101";
         src = fetchFromGitHub {
           owner = "lifelike";
@@ -16334,6 +16971,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "decl";
+        ename = "decl";
         version = "20171212.658";
         src = fetchFromGitHub {
           owner = "preetpalS";
@@ -16358,6 +16996,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "dedicated";
+        ename = "dedicated";
         version = "20090428.1231";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -16382,6 +17021,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dedukti-mode";
+        ename = "dedukti-mode";
         version = "20171103.512";
         src = fetchFromGitHub {
           owner = "rafoo";
@@ -16406,6 +17046,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "default-text-scale";
+        ename = "default-text-scale";
         version = "20180520.2349";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -16431,6 +17072,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "deferred";
+        ename = "deferred";
         version = "20170901.630";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -16456,6 +17098,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "define-word";
+        ename = "define-word";
         version = "20180706.1329";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -16481,6 +17124,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "defproject";
+        ename = "defproject";
         version = "20151201.1419";
         src = fetchFromGitHub {
           owner = "kotfic";
@@ -16505,6 +17149,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "deft";
+        ename = "deft";
         version = "20180619.857";
         src = fetchFromGitHub {
           owner = "jrblevin";
@@ -16529,6 +17174,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "delim-kill";
+        ename = "delim-kill";
         version = "20100516.2320";
         src = fetchFromGitHub {
           owner = "thomas11";
@@ -16555,6 +17201,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "demangle-mode";
+        ename = "demangle-mode";
         version = "20180515.1945";
         src = fetchFromGitHub {
           owner = "liblit";
@@ -16579,6 +17226,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "demo-it";
+        ename = "demo-it";
         version = "20180403.2032";
         src = fetchFromGitHub {
           owner = "howardabrams";
@@ -16604,6 +17252,7 @@
                                    , yabin }:
       melpaBuild {
         pname = "describe-number";
+        ename = "describe-number";
         version = "20151031.1755";
         src = fetchFromGitHub {
           owner = "netromdk";
@@ -16629,6 +17278,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "desktop-environment";
+        ename = "desktop-environment";
         version = "20180423.153";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -16656,6 +17306,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "desktop-plus";
+        ename = "desktop+";
         version = "20170107.1332";
         src = fetchFromGitHub {
           owner = "ffevotte";
@@ -16680,6 +17331,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "desktop-registry";
+        ename = "desktop-registry";
         version = "20140119.1343";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -16704,6 +17356,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "devdocs";
+        ename = "devdocs";
         version = "20170731.150";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -16728,6 +17381,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "dfmt";
+        ename = "dfmt";
         version = "20170728.323";
         src = fetchFromGitHub {
           owner = "qsimpleq";
@@ -16753,6 +17407,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dhall-mode";
+        ename = "dhall-mode";
         version = "20180715.213";
         src = fetchFromGitHub {
           owner = "psibi";
@@ -16778,6 +17433,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "diary-manager";
+        ename = "diary-manager";
         version = "20180626.1058";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -16804,6 +17460,7 @@
                                   , w3m }:
       melpaBuild {
         pname = "dic-lookup-w3m";
+        ename = "dic-lookup-w3m";
         version = "20170803.354";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -16831,6 +17488,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dictcc";
+        ename = "dictcc";
         version = "20171213.1334";
         src = fetchFromGitHub {
           owner = "cqql";
@@ -16857,6 +17515,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dictionary";
+        ename = "dictionary";
         version = "20140717.2029";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -16883,6 +17542,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "diff-hl";
+        ename = "diff-hl";
         version = "20180201.355";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -16911,6 +17571,7 @@
                            , s }:
       melpaBuild {
         pname = "difflib";
+        ename = "difflib";
         version = "20171227.718";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -16935,6 +17596,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "diffscuss-mode";
+        ename = "diffscuss-mode";
         version = "20141014.1657";
         src = fetchFromGitHub {
           owner = "hut8labs";
@@ -16959,6 +17621,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diffview";
+        ename = "diffview";
         version = "20150928.2211";
         src = fetchFromGitHub {
           owner = "mgalgs";
@@ -16983,6 +17646,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "digistar-mode";
+        ename = "digistar-mode";
         version = "20160218.1155";
         src = fetchFromGitHub {
           owner = "retroj";
@@ -17008,6 +17672,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "digit-groups";
+        ename = "digit-groups";
         version = "20160816.1926";
         src = fetchhg {
           url = "https://bitbucket.com/adamsmd/digit-groups";
@@ -17033,6 +17698,7 @@
                                 , request }:
       melpaBuild {
         pname = "digitalocean";
+        ename = "digitalocean";
         version = "20180603.225";
         src = fetchFromGitLab {
           owner = "olymk2";
@@ -17060,6 +17726,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "digitalocean-helm";
+        ename = "digitalocean-helm";
         version = "20180610.46";
         src = fetchFromGitLab {
           owner = "olymk2";
@@ -17085,6 +17752,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "dim";
+        ename = "dim";
         version = "20160818.249";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -17109,6 +17777,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dim-autoload";
+        ename = "dim-autoload";
         version = "20180318.1327";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -17133,6 +17802,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diminish";
+        ename = "diminish";
         version = "20170419.1036";
         src = fetchFromGitHub {
           owner = "myrjola";
@@ -17158,6 +17828,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dimmer";
+        ename = "dimmer";
         version = "20180217.2011";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -17188,6 +17859,7 @@
                             , s }:
       melpaBuild {
         pname = "dionysos";
+        ename = "dionysos";
         version = "20160810.356";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -17212,6 +17884,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dircmp";
+        ename = "dircmp";
         version = "20141204.956";
         src = fetchFromGitHub {
           owner = "matthewlmcclure";
@@ -17237,6 +17910,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dired-atool";
+        ename = "dired-atool";
         version = "20180302.2340";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -17263,6 +17937,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-avfs";
+        ename = "dired-avfs";
         version = "20161012.404";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17289,6 +17964,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "dired-collapse";
+        ename = "dired-collapse";
         version = "20180530.727";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17313,6 +17989,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-dups";
+        ename = "dired-dups";
         version = "20130527.1425";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -17337,6 +18014,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-efap";
+        ename = "dired-efap";
         version = "20140122.856";
         src = fetchFromGitHub {
           owner = "juan-leon";
@@ -17362,6 +18040,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "dired-explorer";
+        ename = "dired-explorer";
         version = "20180606.1921";
         src = fetchFromGitHub {
           owner = "jidaikobo-shibata";
@@ -17386,6 +18065,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dired-fdclone";
+        ename = "dired-fdclone";
         version = "20180402.2308";
         src = fetchFromGitHub {
           owner = "knu";
@@ -17410,6 +18090,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "dired-filetype-face";
+        ename = "dired-filetype-face";
         version = "20160822.655";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -17438,6 +18119,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-filter";
+        ename = "dired-filter";
         version = "20171010.204";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17463,6 +18145,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "dired-hacks-utils";
+        ename = "dired-hacks-utils";
         version = "20160527.1436";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17488,6 +18171,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "dired-hide-dotfiles";
+        ename = "dired-hide-dotfiles";
         version = "20170314.1339";
         src = fetchFromGitHub {
           owner = "mattiasb";
@@ -17513,6 +18197,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-icon";
+        ename = "dired-icon";
         version = "20170222.2126";
         src = fetchFromGitLab {
           owner = "xuhdev";
@@ -17537,6 +18222,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dired-imenu";
+        ename = "dired-imenu";
         version = "20140109.810";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -17562,6 +18248,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "dired-k";
+        ename = "dired-k";
         version = "20170313.803";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -17586,6 +18273,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-launch";
+        ename = "dired-launch";
         version = "20180607.1141";
         src = fetchFromGitHub {
           owner = "thomp";
@@ -17612,6 +18300,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-narrow";
+        ename = "dired-narrow";
         version = "20170309.329";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17638,6 +18327,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-open";
+        ename = "dired-open";
         version = "20160205.1213";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17663,6 +18353,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "dired-quick-sort";
+        ename = "dired-quick-sort";
         version = "20161208.1312";
         src = fetchFromGitLab {
           owner = "xuhdev";
@@ -17689,6 +18380,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dired-rainbow";
+        ename = "dired-rainbow";
         version = "20171202.1448";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17715,6 +18407,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-ranger";
+        ename = "dired-ranger";
         version = "20180401.1506";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17740,6 +18433,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-recent";
+        ename = "dired-recent";
         version = "20180527.1259";
         src = fetchFromGitHub {
           owner = "vifon";
@@ -17767,6 +18461,7 @@
                                , s }:
       melpaBuild {
         pname = "dired-rsync";
+        ename = "dired-rsync";
         version = "20180625.1448";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -17793,6 +18488,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dired-sidebar";
+        ename = "dired-sidebar";
         version = "20180709.2204";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -17817,6 +18513,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-single";
+        ename = "dired-single";
         version = "20170804.544";
         src = fetchFromGitHub {
           owner = "crocket";
@@ -17843,6 +18540,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dired-subtree";
+        ename = "dired-subtree";
         version = "20170910.1521";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17867,6 +18565,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-toggle";
+        ename = "dired-toggle";
         version = "20140907.1349";
         src = fetchFromGitHub {
           owner = "fasheng";
@@ -17891,6 +18590,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "dired-toggle-sudo";
+        ename = "dired-toggle-sudo";
         version = "20151109.206";
         src = fetchFromGitHub {
           owner = "renard";
@@ -17916,6 +18616,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "diredfl";
+        ename = "diredfl";
         version = "20180210.1814";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17940,6 +18641,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diredful";
+        ename = "diredful";
         version = "20160529.1317";
         src = fetchFromGitHub {
           owner = "thamer";
@@ -17967,6 +18669,7 @@
                           , with-editor }:
       melpaBuild {
         pname = "direnv";
+        ename = "direnv";
         version = "20180513.123";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -17991,6 +18694,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "direx";
+        ename = "direx";
         version = "20170422.627";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -18016,6 +18720,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "direx-grep";
+        ename = "direx-grep";
         version = "20140515.806";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -18042,6 +18747,7 @@
                            , windata }:
       melpaBuild {
         pname = "dirtree";
+        ename = "dirtree";
         version = "20140129.32";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -18068,6 +18774,7 @@
                                     , prosjekt }:
       melpaBuild {
         pname = "dirtree-prosjekt";
+        ename = "dirtree-prosjekt";
         version = "20140129.104";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -18092,6 +18799,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "disable-mouse";
+        ename = "disable-mouse";
         version = "20171226.1715";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -18116,6 +18824,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "disaster";
+        ename = "disaster";
         version = "20171016.1452";
         src = fetchFromGitHub {
           owner = "jart";
@@ -18143,6 +18852,7 @@
                              , s }:
       melpaBuild {
         pname = "discourse";
+        ename = "discourse";
         version = "20160911.119";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -18168,6 +18878,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "discover";
+        ename = "discover";
         version = "20140103.1339";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -18194,6 +18905,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "discover-clj-refactor";
+        ename = "discover-clj-refactor";
         version = "20150328.759";
         src = fetchFromGitHub {
           owner = "maio";
@@ -18220,6 +18932,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "discover-js2-refactor";
+        ename = "discover-js2-refactor";
         version = "20140129.752";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -18245,6 +18958,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "discover-my-major";
+        ename = "discover-my-major";
         version = "20180605.2211";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/discover-my-major.git";
@@ -18268,6 +18982,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "disk";
+        ename = "disk";
         version = "20171115.2331";
         src = fetchFromGitHub {
           owner = "kensanata";
@@ -18293,6 +19008,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "dispass";
+        ename = "dispass";
         version = "20140202.731";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -18318,6 +19034,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "display-theme";
+        ename = "display-theme";
         version = "20140115.756";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -18342,6 +19059,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "distel-completion-lib";
+        ename = "distel-completion-lib";
         version = "20160816.406";
         src = fetchFromGitHub {
           owner = "sebastiw";
@@ -18366,6 +19084,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "distinguished-theme";
+        ename = "distinguished-theme";
         version = "20151216.1215";
         src = fetchFromGitHub {
           owner = "Lokaltog";
@@ -18390,6 +19109,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ditz-mode";
+        ename = "ditz-mode";
         version = "20150729.240";
         src = fetchhg {
           url = "https://bitbucket.com/zondo/ditz-mode";
@@ -18414,6 +19134,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "dix";
+        ename = "dix";
         version = "20170224.615";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -18440,6 +19161,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dix-evil";
+        ename = "dix-evil";
         version = "20170105.623";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -18464,6 +19186,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dizzee";
+        ename = "dizzee";
         version = "20171201.116";
         src = fetchFromGitHub {
           owner = "davidmiller";
@@ -18489,6 +19212,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "django-manage";
+        ename = "django-manage";
         version = "20160818.1912";
         src = fetchFromGitHub {
           owner = "gopar";
@@ -18516,6 +19240,7 @@
                                , s }:
       melpaBuild {
         pname = "django-mode";
+        ename = "django-mode";
         version = "20170522.14";
         src = fetchFromGitHub {
           owner = "myfreeweb";
@@ -18541,6 +19266,7 @@
                                    , yasnippet }:
       melpaBuild {
         pname = "django-snippets";
+        ename = "django-snippets";
         version = "20131229.811";
         src = fetchFromGitHub {
           owner = "myfreeweb";
@@ -18565,6 +19291,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "django-theme";
+        ename = "django-theme";
         version = "20131022.202";
         src = fetchFromGitHub {
           owner = "andrzejsliwa";
@@ -18594,6 +19321,7 @@
                               , s }:
       melpaBuild {
         pname = "djangonaut";
+        ename = "djangonaut";
         version = "20180710.1445";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -18620,6 +19348,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "dkdo";
+        ename = "dkdo";
         version = "20131110.319";
         src = fetchFromGitHub {
           owner = "davidkeegan";
@@ -18644,6 +19373,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "dkl";
+        ename = "dkl";
         version = "20161004.1707";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -18671,6 +19401,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "dklrt";
+        ename = "dklrt";
         version = "20131110.541";
         src = fetchFromGitHub {
           owner = "davidkeegan";
@@ -18696,6 +19427,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dkmisc";
+        ename = "dkmisc";
         version = "20131110.315";
         src = fetchFromGitHub {
           owner = "davidkeegan";
@@ -18721,6 +19453,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "dmenu";
+        ename = "dmenu";
         version = "20180118.445";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -18745,6 +19478,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dna-mode";
+        ename = "dna-mode";
         version = "20170804.114";
         src = fetchFromGitHub {
           owner = "jhgorrell";
@@ -18770,6 +19504,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "docbook-snippets";
+        ename = "docbook-snippets";
         version = "20150714.925";
         src = fetchFromGitHub {
           owner = "jhradilek";
@@ -18797,6 +19532,7 @@
                           , request }:
       melpaBuild {
         pname = "docean";
+        ename = "docean";
         version = "20180605.1044";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -18828,6 +19564,7 @@
                           , tablist }:
       melpaBuild {
         pname = "docker";
+        ename = "docker";
         version = "20180710.743";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -18863,6 +19600,7 @@
                               , s }:
       melpaBuild {
         pname = "docker-api";
+        ename = "docker-api";
         version = "20160525.20";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -18890,6 +19628,7 @@
                                        , yaml-mode }:
       melpaBuild {
         pname = "docker-compose-mode";
+        ename = "docker-compose-mode";
         version = "20180324.1052";
         src = fetchFromGitHub {
           owner = "meqif";
@@ -18916,6 +19655,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "docker-tramp";
+        ename = "docker-tramp";
         version = "20170206.1925";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -18942,6 +19682,7 @@
                                    , s }:
       melpaBuild {
         pname = "dockerfile-mode";
+        ename = "dockerfile-mode";
         version = "20180628.959";
         src = fetchFromGitHub {
           owner = "spotify";
@@ -18968,6 +19709,7 @@
                             , xml-rpc }:
       melpaBuild {
         pname = "dokuwiki";
+        ename = "dokuwiki";
         version = "20180101.1659";
         src = fetchFromGitHub {
           owner = "accidentalrebel";
@@ -18992,6 +19734,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dokuwiki-mode";
+        ename = "dokuwiki-mode";
         version = "20170223.501";
         src = fetchFromGitHub {
           owner = "kai2nenobu";
@@ -19017,6 +19760,7 @@
                            , s }:
       melpaBuild {
         pname = "dollaro";
+        ename = "dollaro";
         version = "20151123.502";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -19041,6 +19785,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "doneburn-theme";
+        ename = "doneburn-theme";
         version = "20180502.1004";
         src = fetchFromGitHub {
           owner = "manuel-uberti";
@@ -19066,6 +19811,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "doom";
+        ename = "doom";
         version = "20180301.1508";
         src = fetchFromGitHub {
           owner = "kensanata";
@@ -19096,6 +19842,7 @@
                                  , shrink-path }:
       melpaBuild {
         pname = "doom-modeline";
+        ename = "doom-modeline";
         version = "20180712.2015";
         src = fetchFromGitHub {
           owner = "seagle0128";
@@ -19130,12 +19877,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "doom-themes";
-        version = "20180711.1157";
+        ename = "doom-themes";
+        version = "20180720.438";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "67428c4c8c29a8c62aab2b8011ac82ff8e753dec";
-          sha256 = "0s7r2h6wajfd40ayzsml2ka74dbplg86gip7ra0x9b495g779qxd";
+          rev = "75d43068733201b8c9c45f9e637ceaab2ff565a4";
+          sha256 = "11pbk4clc3rxzibrrz8rbfx52kd3fkxdyl6wv8mi1s8p7jw4ffln";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -19155,6 +19903,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dot-mode";
+        ename = "dot-mode";
         version = "20180312.1600";
         src = fetchFromGitHub {
           owner = "wyrickre";
@@ -19180,6 +19929,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dotenv-mode";
+        ename = "dotenv-mode";
         version = "20180207.1114";
         src = fetchFromGitHub {
           owner = "preetpalS";
@@ -19204,6 +19954,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dotnet";
+        ename = "dotnet";
         version = "20170827.838";
         src = fetchFromGitHub {
           owner = "julienXX";
@@ -19229,6 +19980,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "download-region";
+        ename = "download-region";
         version = "20180123.1733";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -19253,6 +20005,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "downplay-mode";
+        ename = "downplay-mode";
         version = "20151125.1209";
         src = fetchFromGitHub {
           owner = "tobias";
@@ -19277,6 +20030,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dpaste";
+        ename = "dpaste";
         version = "20160303.1312";
         src = fetchFromGitHub {
           owner = "gregnewman";
@@ -19302,6 +20056,7 @@
                              , web }:
       melpaBuild {
         pname = "dpaste_de";
+        ename = "dpaste_de";
         version = "20131015.525";
         src = fetchFromGitHub {
           owner = "theju";
@@ -19327,6 +20082,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "dr-racket-like-unicode";
+        ename = "dr-racket-like-unicode";
         version = "20161021.511";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -19352,6 +20108,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dracula-theme";
+        ename = "dracula-theme";
         version = "20180710.624";
         src = fetchFromGitHub {
           owner = "dracula";
@@ -19376,6 +20133,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "draft-mode";
+        ename = "draft-mode";
         version = "20140609.756";
         src = fetchFromGitLab {
           owner = "gaudecker";
@@ -19400,6 +20158,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "drag-stuff";
+        ename = "drag-stuff";
         version = "20161107.2349";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -19425,6 +20184,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "drawille";
+        ename = "drawille";
         version = "20160418.1138";
         src = fetchFromGitHub {
           owner = "sshbio";
@@ -19450,6 +20210,7 @@
                                                , popup }:
       melpaBuild {
         pname = "drill-instructor-AZIK-force";
+        ename = "drill-instructor-AZIK-force";
         version = "20151122.2114";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -19474,6 +20235,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "drone";
+        ename = "drone";
         version = "20161106.118";
         src = fetchFromGitHub {
           owner = "olymk2";
@@ -19500,6 +20262,7 @@
                            , oauth }:
       melpaBuild {
         pname = "dropbox";
+        ename = "dropbox";
         version = "20170502.1722";
         src = fetchFromGitHub {
           owner = "pavpanchekha";
@@ -19525,6 +20288,7 @@
                                , php-mode }:
       melpaBuild {
         pname = "drupal-mode";
+        ename = "drupal-mode";
         version = "20171120.1509";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -19549,6 +20313,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "drupal-spell";
+        ename = "drupal-spell";
         version = "20130520.955";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -19573,6 +20338,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "dsvn";
+        ename = "dsvn";
         version = "20130120.1257";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -19597,6 +20363,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "dtrace-script-mode";
+        ename = "dtrace-script-mode";
         version = "20150213.2223";
         src = fetchFromGitHub {
           owner = "dotemacs";
@@ -19621,6 +20388,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dtrt-indent";
+        ename = "dtrt-indent";
         version = "20180628.1438";
         src = fetchFromGitHub {
           owner = "jscheid";
@@ -19645,6 +20413,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dts-mode";
+        ename = "dts-mode";
         version = "20161103.523";
         src = fetchFromGitHub {
           owner = "bgamari";
@@ -19670,6 +20439,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ducpel";
+        ename = "ducpel";
         version = "20140702.454";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -19695,6 +20465,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "dumb-diff";
+        ename = "dumb-diff";
         version = "20171211.1322";
         src = fetchFromGitHub {
           owner = "jacktasia";
@@ -19724,6 +20495,7 @@
                              , s }:
       melpaBuild {
         pname = "dumb-jump";
+        ename = "dumb-jump";
         version = "20180615.2114";
         src = fetchFromGitHub {
           owner = "jacktasia";
@@ -19748,6 +20520,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dummyparens";
+        ename = "dummyparens";
         version = "20141009.324";
         src = fetchFromGitHub {
           owner = "snosov1";
@@ -19772,6 +20545,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "duplicate-thing";
+        ename = "duplicate-thing";
         version = "20120515.948";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -19797,6 +20571,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dut-mode";
+        ename = "dut-mode";
         version = "20170729.1411";
         src = fetchFromGitHub {
           owner = "dut-lang";
@@ -19823,6 +20598,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dyalog-mode";
+        ename = "dyalog-mode";
         version = "20180605.1413";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
@@ -19846,6 +20622,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dylan-mode";
+        ename = "dylan-mode";
         version = "20160405.1514";
         src = fetchFromGitHub {
           owner = "dylan-lang";
@@ -19873,6 +20650,7 @@
                                  , persistent-soft }:
       melpaBuild {
         pname = "dynamic-fonts";
+        ename = "dynamic-fonts";
         version = "20140731.526";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -19897,6 +20675,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dynamic-ruler";
+        ename = "dynamic-ruler";
         version = "20160602.108";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -19921,6 +20700,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "dynamic-spaces";
+        ename = "dynamic-spaces";
         version = "20171027.1151";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -19946,6 +20726,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "e2ansi";
+        ename = "e2ansi";
         version = "20180403.1215";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -19971,6 +20752,7 @@
                         , window-layout }:
       melpaBuild {
         pname = "e2wm";
+        ename = "e2wm";
         version = "20170214.1636";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -19998,6 +20780,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "e2wm-R";
+        ename = "e2wm-R";
         version = "20151230.126";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -20023,6 +20806,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "e2wm-bookmark";
+        ename = "e2wm-bookmark";
         version = "20151122.2121";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -20049,6 +20833,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "e2wm-direx";
+        ename = "e2wm-direx";
         version = "20170509.601";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -20075,6 +20860,7 @@
                                  , plsense-direx }:
       melpaBuild {
         pname = "e2wm-pkgex4pl";
+        ename = "e2wm-pkgex4pl";
         version = "20140525.347";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -20101,6 +20887,7 @@
                                   , svg-clock }:
       melpaBuild {
         pname = "e2wm-svg-clock";
+        ename = "e2wm-svg-clock";
         version = "20150106.506";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -20126,6 +20913,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "e2wm-sww";
+        ename = "e2wm-sww";
         version = "20140524.158";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -20153,6 +20941,7 @@
                              , yaxception }:
       melpaBuild {
         pname = "e2wm-term";
+        ename = "e2wm-term";
         version = "20141009.608";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -20179,6 +20968,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eacl";
+        ename = "eacl";
         version = "20180607.658";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -20203,6 +20993,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "easy-after-load";
+        ename = "easy-after-load";
         version = "20170817.531";
         src = fetchFromGitHub {
           owner = "pd";
@@ -20227,6 +21018,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "easy-escape";
+        ename = "easy-escape";
         version = "20161209.744";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -20253,12 +21045,13 @@
                              , popup }:
       melpaBuild {
         pname = "easy-hugo";
-        version = "20180531.221";
+        ename = "easy-hugo";
+        version = "20180719.20";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "3b0516c87d33a75dd777f6336fdf53be0374abcb";
-          sha256 = "1qf7wk0vx1p0y77cnzihq4zrmz1dffwabsxgf0mz770nskys6y82";
+          rev = "8bf48b973905c4ab488633226b3dfb3317d8c745";
+          sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -20278,6 +21071,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "easy-jekyll";
+        ename = "easy-jekyll";
         version = "20180513.1107";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -20304,6 +21098,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "easy-kill";
+        ename = "easy-kill";
         version = "20151030.2229";
         src = fetchFromGitHub {
           owner = "leoliu";
@@ -20329,6 +21124,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "easy-kill-extras";
+        ename = "easy-kill-extras";
         version = "20161028.504";
         src = fetchFromGitHub {
           owner = "knu";
@@ -20354,6 +21150,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "easy-repeat";
+        ename = "easy-repeat";
         version = "20150516.148";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -20380,6 +21177,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ebal";
+        ename = "ebal";
         version = "20171231.2216";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -20407,6 +21205,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ebf";
+        ename = "ebf";
         version = "20160211.958";
         src = fetchFromGitHub {
           owner = "rexim";
@@ -20435,6 +21234,7 @@
                         , seq }:
       melpaBuild {
         pname = "ebib";
+        ename = "ebib";
         version = "20180428.1401";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -20459,6 +21259,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ecb";
+        ename = "ecb";
         version = "20170728.1221";
         src = fetchFromGitHub {
           owner = "ecb-home";
@@ -20489,6 +21290,7 @@
                          , yasnippet }:
       melpaBuild {
         pname = "eclim";
+        ename = "eclim";
         version = "20171113.1754";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -20513,6 +21315,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "eclipse-theme";
+        ename = "eclipse-theme";
         version = "20160430.322";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -20543,6 +21346,7 @@
                           , s }:
       melpaBuild {
         pname = "ecukes";
+        ename = "ecukes";
         version = "20171216.408";
         src = fetchFromGitHub {
           owner = "ecukes";
@@ -20570,6 +21374,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "edbi";
+        ename = "edbi";
         version = "20160224.1741";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -20596,6 +21401,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "edbi-database-url";
+        ename = "edbi-database-url";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -20623,6 +21429,7 @@
                                , pythonic }:
       melpaBuild {
         pname = "edbi-django";
+        ename = "edbi-django";
         version = "20180627.300";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -20648,6 +21455,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "edbi-minor-mode";
+        ename = "edbi-minor-mode";
         version = "20160706.747";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -20674,6 +21482,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "edbi-sqlite";
+        ename = "edbi-sqlite";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -20701,6 +21510,7 @@
                               , semantic ? null }:
       melpaBuild {
         pname = "ede-compdb";
+        ename = "ede-compdb";
         version = "20150920.1333";
         src = fetchFromGitHub {
           owner = "randomphrase";
@@ -20725,6 +21535,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ede-php-autoload";
+        ename = "ede-php-autoload";
         version = "20170428.933";
         src = fetchFromGitHub {
           owner = "stevenremot";
@@ -20752,6 +21563,7 @@
                                                         , s }:
       melpaBuild {
         pname = "ede-php-autoload-composer-installers";
+        ename = "ede-php-autoload-composer-installers";
         version = "20170221.1226";
         src = fetchFromGitHub {
           owner = "xendk";
@@ -20779,6 +21591,7 @@
                                            , s }:
       melpaBuild {
         pname = "ede-php-autoload-drupal";
+        ename = "ede-php-autoload-drupal";
         version = "20170316.1458";
         src = fetchFromGitHub {
           owner = "xendk";
@@ -20803,6 +21616,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "edebug-x";
+        ename = "edebug-x";
         version = "20130615.2325";
         src = fetchFromGitHub {
           owner = "ScottyB";
@@ -20827,6 +21641,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "edit-at-point";
+        ename = "edit-at-point";
         version = "20150716.624";
         src = fetchFromGitHub {
           owner = "enoson";
@@ -20853,6 +21668,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "edit-color-stamp";
+        ename = "edit-color-stamp";
         version = "20130529.1033";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -20878,6 +21694,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "edit-indirect";
+        ename = "edit-indirect";
         version = "20180422.1107";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -20905,6 +21722,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "edit-indirect-region-latex";
+        ename = "edit-indirect-region-latex";
         version = "20161128.2245";
         src = fetchFromGitHub {
           owner = "niitsuma";
@@ -20929,6 +21747,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "edit-list";
+        ename = "edit-list";
         version = "20100930.743";
         src = fetchFromGitHub {
           owner = "emacsmirror";
@@ -20953,6 +21772,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "edit-server";
+        ename = "edit-server";
         version = "20180120.752";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -20978,6 +21798,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "edit-server-htmlize";
+        ename = "edit-server-htmlize";
         version = "20130329.1548";
         src = fetchFromGitHub {
           owner = "frobtech";
@@ -21003,6 +21824,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "editorconfig";
+        ename = "editorconfig";
         version = "20180708.228";
         src = fetchFromGitHub {
           owner = "editorconfig";
@@ -21028,6 +21850,7 @@
                                                , melpaBuild }:
       melpaBuild {
         pname = "editorconfig-charset-extras";
+        ename = "editorconfig-charset-extras";
         version = "20180222.2057";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -21053,6 +21876,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "editorconfig-custom-majormode";
+        ename = "editorconfig-custom-majormode";
         version = "20180507.1942";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -21079,6 +21903,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "editorconfig-domain-specific";
+        ename = "editorconfig-domain-specific";
         version = "20180505.224";
         src = fetchFromGitHub {
           owner = "lassik";
@@ -21106,6 +21931,7 @@
                        , peg }:
       melpaBuild {
         pname = "edn";
+        ename = "edn";
         version = "20160215.419";
         src = fetchFromGitHub {
           owner = "expez";
@@ -21137,6 +21963,7 @@
                         , s }:
       melpaBuild {
         pname = "edts";
+        ename = "edts";
         version = "20171030.9";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
@@ -21170,6 +21997,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "efire";
+        ename = "efire";
         version = "20151009.1331";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -21196,6 +22024,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "eg";
+        ename = "eg";
         version = "20170830.115";
         src = fetchFromGitHub {
           owner = "davep";
@@ -21220,6 +22049,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "egg";
+        ename = "egg";
         version = "20180713.218";
         src = fetchFromGitHub {
           owner = "byplayer";
@@ -21244,6 +22074,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "egison-mode";
+        ename = "egison-mode";
         version = "20160603.103";
         src = fetchFromGitHub {
           owner = "egisatoshi";
@@ -21270,12 +22101,13 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "eglot";
-        version = "20180711.1630";
+        ename = "eglot";
+        version = "20180722.1107";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "eglot";
-          rev = "a57d5d8301d5fadc468e14fedc434d7504e24e24";
-          sha256 = "0xjdpxdv70i0h4rhvfhdkaf2hd40dmxp6prxm0irjzyns4cwxync";
+          rev = "8d61ecaa8c38a02322c281ac7072e2884d63012f";
+          sha256 = "0bcs97irg1qqsnjyby0ncm0kl64yrri3vgicfyakl978pixz5hr7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot";
@@ -21301,6 +22133,7 @@
                        , simple-httpd }:
       melpaBuild {
         pname = "ego";
+        ename = "ego";
         version = "20180228.1704";
         src = fetchFromGitHub {
           owner = "emacs-china";
@@ -21325,6 +22158,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eide";
+        ename = "eide";
         version = "20180626.1259";
         src = fetchgit {
           url = "https://framagit.org/eide/eide.git";
@@ -21348,6 +22182,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eimp";
+        ename = "eimp";
         version = "20120826.1339";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -21381,6 +22216,7 @@
                        , websocket }:
       melpaBuild {
         pname = "ein";
+        ename = "ein";
         version = "20180626.1257";
         src = fetchFromGitHub {
           owner = "millejoh";
@@ -21416,6 +22252,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ein-mumamo";
+        ename = "ein-mumamo";
         version = "20150301.1628";
         src = fetchFromGitHub {
           owner = "millejoh";
@@ -21440,6 +22277,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eink-theme";
+        ename = "eink-theme";
         version = "20170717.807";
         src = fetchFromGitHub {
           owner = "maio";
@@ -21470,6 +22308,7 @@
                            , spinner }:
       melpaBuild {
         pname = "ejc-sql";
+        ename = "ejc-sql";
         version = "20180701.1105";
         src = fetchFromGitHub {
           owner = "kostafey";
@@ -21494,6 +22333,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "el-autoyas";
+        ename = "el-autoyas";
         version = "20120918.617";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -21519,6 +22359,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "el-fly-indent-mode";
+        ename = "el-fly-indent-mode";
         version = "20180421.1943";
         src = fetchFromGitHub {
           owner = "jiahaowork";
@@ -21543,6 +22384,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "el-get";
+        ename = "el-get";
         version = "20180610.1821";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -21570,6 +22412,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "el-init";
+        ename = "el-init";
         version = "20150728.220";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -21600,6 +22443,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "el-init-viewer";
+        ename = "el-init-viewer";
         version = "20150303.28";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -21624,6 +22468,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "el-mock";
+        ename = "el-mock";
         version = "20170824.1254";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -21649,12 +22494,13 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "el-patch";
-        version = "20180712.1302";
+        ename = "el-patch";
+        version = "20180720.821";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "9f4b71f78ed2bc0661f9bccac53672aa1093e9ec";
-          sha256 = "1j5wcqpwkj70z697qlmrjnzj667ndbvwcp3wfyd2c66rzdbafs65";
+          rev = "aaa4c4c1afaa48da9da210010f5131affbff720a";
+          sha256 = "04hmhnx854519k53b8r04zmd21hi9bgs9j5yphv7kizn0cpbrjka";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -21675,6 +22521,7 @@
                              , web }:
       melpaBuild {
         pname = "el-pocket";
+        ename = "el-pocket";
         version = "20170922.549";
         src = fetchFromGitHub {
           owner = "pterygota";
@@ -21699,6 +22546,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "el-spec";
+        ename = "el-spec";
         version = "20121018.4";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -21723,6 +22571,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "el-spice";
+        ename = "el-spice";
         version = "20180128.921";
         src = fetchFromGitHub {
           owner = "vedang";
@@ -21750,6 +22599,7 @@
                               , web-server }:
       melpaBuild {
         pname = "el-sprunge";
+        ename = "el-sprunge";
         version = "20140106.1739";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -21774,6 +22624,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "el-spy";
+        ename = "el-spy";
         version = "20131226.1208";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -21798,6 +22649,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "el-x";
+        ename = "el-x";
         version = "20140111.1401";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -21822,6 +22674,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "el2markdown";
+        ename = "el2markdown";
         version = "20170630.1158";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -21847,6 +22700,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "el2org";
+        ename = "el2org";
         version = "20180311.855";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -21873,6 +22727,7 @@
                           , seq }:
       melpaBuild {
         pname = "elbank";
+        ename = "elbank";
         version = "20180316.643";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -21903,6 +22758,7 @@
                              , uuidgen }:
       melpaBuild {
         pname = "elcontext";
+        ename = "elcontext";
         version = "20180526.604";
         src = fetchFromGitHub {
           owner = "rollacaster";
@@ -21928,6 +22784,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elcord";
+        ename = "elcord";
         version = "20180411.1207";
         src = fetchFromGitHub {
           owner = "Mstrodl";
@@ -21955,6 +22812,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "elcouch";
+        ename = "elcouch";
         version = "20180529.57";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -21979,6 +22837,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eldoc-eval";
+        ename = "eldoc-eval";
         version = "20180607.457";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -22006,6 +22865,7 @@
                                  , quick-peek }:
       melpaBuild {
         pname = "eldoc-overlay";
+        ename = "eldoc-overlay";
         version = "20171219.140";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -22030,6 +22890,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "electric-case";
+        ename = "electric-case";
         version = "20150417.412";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -22057,6 +22918,7 @@
                                      , names }:
       melpaBuild {
         pname = "electric-operator";
+        ename = "electric-operator";
         version = "20180627.1012";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -22081,6 +22943,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "electric-spacing";
+        ename = "electric-spacing";
         version = "20161209.1157";
         src = fetchFromGitHub {
           owner = "xwl";
@@ -22105,6 +22968,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "elein";
+        ename = "elein";
         version = "20120120.316";
         src = fetchFromGitHub {
           owner = "remvee";
@@ -22130,6 +22994,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "elf-mode";
+        ename = "elf-mode";
         version = "20161009.48";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -22155,6 +23020,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elfeed";
+        ename = "elfeed";
         version = "20180713.529";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -22185,6 +23051,7 @@
                                   , powerline }:
       melpaBuild {
         pname = "elfeed-goodies";
+        ename = "elfeed-goodies";
         version = "20171126.2251";
         src = fetchFromGitHub {
           owner = "algernon";
@@ -22221,6 +23088,7 @@
                               , s }:
       melpaBuild {
         pname = "elfeed-org";
+        ename = "elfeed-org";
         version = "20180129.507";
         src = fetchFromGitHub {
           owner = "remyhonig";
@@ -22248,6 +23116,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "elfeed-protocol";
+        ename = "elfeed-protocol";
         version = "20180409.813";
         src = fetchFromGitHub {
           owner = "fasheng";
@@ -22275,6 +23144,7 @@
                               , simple-httpd }:
       melpaBuild {
         pname = "elfeed-web";
+        ename = "elfeed-web";
         version = "20180513.524";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -22300,6 +23170,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elgrep";
+        ename = "elgrep";
         version = "20180302.527";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
@@ -22325,6 +23196,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elhome";
+        ename = "elhome";
         version = "20161025.1342";
         src = fetchFromGitHub {
           owner = "demyanrogozhin";
@@ -22353,6 +23225,7 @@
                              , s }:
       melpaBuild {
         pname = "elisp-def";
+        ename = "elisp-def";
         version = "20180410.224";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -22377,6 +23250,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "elisp-depend";
+        ename = "elisp-depend";
         version = "20161230.750";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -22401,6 +23275,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "elisp-docstring-mode";
+        ename = "elisp-docstring-mode";
         version = "20170304.815";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -22425,6 +23300,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "elisp-format";
+        ename = "elisp-format";
         version = "20160508.252";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
@@ -22450,6 +23326,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elisp-lint";
+        ename = "elisp-lint";
         version = "20180224.1242";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -22477,12 +23354,13 @@
                               , s }:
       melpaBuild {
         pname = "elisp-refs";
-        version = "20180519.1621";
+        ename = "elisp-refs";
+        version = "20180715.1602";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "bfcaf044da815982cb8f0d35ad4d03e4926f5353";
-          sha256 = "0znls9anqnkm61s5xqqwwa0waqav30g8pf1h7qy4f82s5plpc1br";
+          rev = "c3fefb803bd0a1b6de654dbd380a8487804789a5";
+          sha256 = "1va1lgc6dhqif11wxsd3b5kzv01q7ys800sly2v605153ajafqw4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -22501,6 +23379,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "elisp-sandbox";
+        ename = "elisp-sandbox";
         version = "20131116.1042";
         src = fetchFromGitHub {
           owner = "joelmccracken";
@@ -22526,6 +23405,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "elisp-slime-nav";
+        ename = "elisp-slime-nav";
         version = "20160128.1109";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -22552,6 +23432,7 @@
                                , pkg-info }:
       melpaBuild {
         pname = "elixir-mode";
+        ename = "elixir-mode";
         version = "20180711.545";
         src = fetchFromGitHub {
           owner = "elixir-lang";
@@ -22577,6 +23458,7 @@
                                      , yasnippet }:
       melpaBuild {
         pname = "elixir-yasnippets";
+        ename = "elixir-yasnippets";
         version = "20150417.539";
         src = fetchFromGitHub {
           owner = "hisea";
@@ -22607,6 +23489,7 @@
                             , seq }:
       melpaBuild {
         pname = "elm-mode";
+        ename = "elm-mode";
         version = "20180114.9";
         src = fetchFromGitHub {
           owner = "jcollard";
@@ -22632,6 +23515,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "elm-yasnippets";
+        ename = "elm-yasnippets";
         version = "20160331.2224";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -22658,6 +23542,7 @@
                            , s }:
       melpaBuild {
         pname = "elmacro";
+        ename = "elmacro";
         version = "20180628.711";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -22683,6 +23568,7 @@
                           , s }:
       melpaBuild {
         pname = "elmine";
+        ename = "elmine";
         version = "20170511.20";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -22715,6 +23601,7 @@
                           , web }:
       melpaBuild {
         pname = "elnode";
+        ename = "elnode";
         version = "20140203.1506";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -22740,6 +23627,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "elog";
+        ename = "elog";
         version = "20160724.1555";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -22766,6 +23654,7 @@
                            , s }:
       melpaBuild {
         pname = "elogcat";
+        ename = "elogcat";
         version = "20151120.1641";
         src = fetchFromGitHub {
           owner = "youngker";
@@ -22791,6 +23680,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "eloud";
+        ename = "eloud";
         version = "20160731.857";
         src = fetchFromGitHub {
           owner = "smythp";
@@ -22815,6 +23705,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elpa-audit";
+        ename = "elpa-audit";
         version = "20141023.631";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -22841,6 +23732,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elpa-clone";
+        ename = "elpa-clone";
         version = "20170502.514";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -22866,6 +23758,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "elpa-mirror";
+        ename = "elpa-mirror";
         version = "20180228.1636";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -22897,12 +23790,13 @@
                         , yasnippet }:
       melpaBuild {
         pname = "elpy";
-        version = "20180707.1413";
+        ename = "elpy";
+        version = "20180720.155";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "01d07876e27faf7042d10872e4c60ae35a4faf4e";
-          sha256 = "076jvrwp8xycsc589p97s2p1jx7728wsl58ivyp1s90k606aq9i4";
+          rev = "db0ee080424ef39b4cd2782a3dbd0afccaaafd04";
+          sha256 = "0gzanxwv1g2hx80qm0m8iy1apsg51hhnh9rq1hicrwyvp1wzc24r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -22931,6 +23825,7 @@
                            , yasnippet }:
       melpaBuild {
         pname = "elpygen";
+        ename = "elpygen";
         version = "20171225.936";
         src = fetchFromGitHub {
           owner = "vkazanov";
@@ -22958,6 +23853,7 @@
                            , s }:
       melpaBuild {
         pname = "elquery";
+        ename = "elquery";
         version = "20180513.1912";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -22983,6 +23879,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "elscreen";
+        ename = "elscreen";
         version = "20180320.1902";
         src = fetchFromGitHub {
           owner = "knu";
@@ -23010,6 +23907,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "elscreen-buffer-group";
+        ename = "elscreen-buffer-group";
         version = "20170808.1825";
         src = fetchFromGitHub {
           owner = "jeffgran";
@@ -23036,6 +23934,7 @@
                                , seq }:
       melpaBuild {
         pname = "elscreen-fr";
+        ename = "elscreen-fr";
         version = "20160920.253";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -23061,6 +23960,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "elscreen-mew";
+        ename = "elscreen-mew";
         version = "20160504.1135";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -23088,6 +23988,7 @@
                                        , multi-term }:
       melpaBuild {
         pname = "elscreen-multi-term";
+        ename = "elscreen-multi-term";
         version = "20151021.1933";
         src = fetchFromGitHub {
           owner = "wamei";
@@ -23114,6 +24015,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "elscreen-separate-buffer-list";
+        ename = "elscreen-separate-buffer-list";
         version = "20161106.1958";
         src = fetchFromGitHub {
           owner = "wamei";
@@ -23139,6 +24041,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "elvish-mode";
+        ename = "elvish-mode";
         version = "20170913.1939";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
@@ -23164,6 +24067,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "elwm";
+        ename = "elwm";
         version = "20150817.307";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -23189,6 +24093,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "elx";
+        ename = "elx";
         version = "20180614.1957";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -23213,6 +24118,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "emacs-setup";
+        ename = "emacs-setup";
         version = "20120727.726";
         src = fetchFromGitHub {
           owner = "echosa";
@@ -23238,6 +24144,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emacsagist";
+        ename = "emacsagist";
         version = "20140331.1130";
         src = fetchFromGitHub {
           owner = "echosa";
@@ -23262,6 +24169,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "emacsc";
+        ename = "emacsc";
         version = "20161028.1006";
         src = fetchFromGitHub {
           owner = "knu";
@@ -23286,6 +24194,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emacsist-view";
+        ename = "emacsist-view";
         version = "20160426.523";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -23311,6 +24220,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "emacsql";
+        ename = "emacsql";
         version = "20180712.1052";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -23337,6 +24247,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emacsql-mysql";
+        ename = "emacsql-mysql";
         version = "20171218.1827";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -23363,6 +24274,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "emacsql-psql";
+        ename = "emacsql-psql";
         version = "20171218.1827";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -23389,6 +24301,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "emacsql-sqlite";
+        ename = "emacsql-sqlite";
         version = "20180128.1252";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -23413,6 +24326,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "emacsshot";
+        ename = "emacsshot";
         version = "20161018.743";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -23438,6 +24352,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "emamux";
+        ename = "emamux";
         version = "20170226.1937";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23464,6 +24379,7 @@
                                     , projectile }:
       melpaBuild {
         pname = "emamux-ruby-test";
+        ename = "emamux-ruby-test";
         version = "20130812.939";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23488,6 +24404,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "emaps";
+        ename = "emaps";
         version = "20180712.1216";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -23513,6 +24430,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ember-mode";
+        ename = "ember-mode";
         version = "20171208.559";
         src = fetchFromGitHub {
           owner = "madnificent";
@@ -23538,6 +24456,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "ember-yasnippets";
+        ename = "ember-yasnippets";
         version = "20160526.958";
         src = fetchFromGitHub {
           owner = "ronco";
@@ -23564,6 +24483,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "embrace";
+        ename = "embrace";
         version = "20171031.1133";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -23590,6 +24510,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "emlib";
+        ename = "emlib";
         version = "20161126.723";
         src = fetchFromGitHub {
           owner = "narendraj9";
@@ -23614,6 +24535,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emmet-mode";
+        ename = "emmet-mode";
         version = "20180612.2041";
         src = fetchFromGitHub {
           owner = "smihica";
@@ -23639,6 +24561,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "emms";
+        ename = "emms";
         version = "20180708.1823";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
@@ -23664,6 +24587,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emms-bilibili";
+        ename = "emms-bilibili";
         version = "20180102.2018";
         src = fetchFromGitHub {
           owner = "0xDEATHCODE";
@@ -23689,6 +24613,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "emms-info-mediainfo";
+        ename = "emms-info-mediainfo";
         version = "20131223.500";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -23714,6 +24639,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emms-mark-ext";
+        ename = "emms-mark-ext";
         version = "20130528.2027";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -23740,6 +24666,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "emms-mode-line-cycle";
+        ename = "emms-mode-line-cycle";
         version = "20160221.320";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -23765,6 +24692,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "emms-player-mpv";
+        ename = "emms-player-mpv";
         version = "20180503.1427";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -23793,6 +24721,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "emms-player-mpv-jp-radios";
+        ename = "emms-player-mpv-jp-radios";
         version = "20180325.417";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -23820,6 +24749,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "emms-player-simple-mpv";
+        ename = "emms-player-simple-mpv";
         version = "20180316.849";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -23846,6 +24776,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "emms-soundcloud";
+        ename = "emms-soundcloud";
         version = "20131221.345";
         src = fetchFromGitHub {
           owner = "osener";
@@ -23871,6 +24802,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emms-state";
+        ename = "emms-state";
         version = "20160504.105";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -23897,6 +24829,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "emoji-cheat-sheet-plus";
+        ename = "emoji-cheat-sheet-plus";
         version = "20150617.631";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -23921,6 +24854,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emoji-display";
+        ename = "emoji-display";
         version = "20140117.213";
         src = fetchFromGitHub {
           owner = "ikazuhiro";
@@ -23945,6 +24879,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emoji-fontset";
+        ename = "emoji-fontset";
         version = "20160726.1224";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -23970,6 +24905,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "emoji-recall";
+        ename = "emoji-recall";
         version = "20160723.1508";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -23997,6 +24933,7 @@
                            , seq }:
       melpaBuild {
         pname = "emojify";
+        ename = "emojify";
         version = "20180611.838";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -24022,6 +24959,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emojify-logos";
+        ename = "emojify-logos";
         version = "20171125.214";
         src = fetchFromGitHub {
           owner = "mxgoldstein";
@@ -24046,6 +24984,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "empos";
+        ename = "empos";
         version = "20151011.1216";
         src = fetchFromGitHub {
           owner = "dimalik";
@@ -24081,6 +25020,7 @@
                        , s }:
       melpaBuild {
         pname = "emr";
+        ename = "emr";
         version = "20180708.1011";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -24117,6 +25057,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "enclose";
+        ename = "enclose";
         version = "20121008.914";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -24142,6 +25083,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "encourage-mode";
+        ename = "encourage-mode";
         version = "20151128.105";
         src = fetchFromGitHub {
           owner = "halbtuerke";
@@ -24167,6 +25109,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "engine-mode";
+        ename = "engine-mode";
         version = "20180401.946";
         src = fetchFromGitHub {
           owner = "hrs";
@@ -24192,6 +25135,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "enh-ruby-mode";
+        ename = "enh-ruby-mode";
         version = "20180403.1251";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -24216,6 +25160,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "enlive";
+        ename = "enlive";
         version = "20170725.717";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -24242,6 +25187,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "eno";
+        ename = "eno";
         version = "20160110.234";
         src = fetchFromGitHub {
           owner = "enoson";
@@ -24266,6 +25212,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "enotify";
+        ename = "enotify";
         version = "20130407.648";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -24297,6 +25244,7 @@
                           , yasnippet }:
       melpaBuild {
         pname = "ensime";
+        ename = "ensime";
         version = "20180615.630";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -24332,6 +25280,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "envdir";
+        ename = "envdir";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -24360,6 +25309,7 @@
                              , s }:
       melpaBuild {
         pname = "eopengrok";
+        ename = "eopengrok";
         version = "20160903.2359";
         src = fetchFromGitHub {
           owner = "youngker";
@@ -24386,6 +25336,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epc";
+        ename = "epc";
         version = "20140609.2234";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -24411,6 +25362,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "epic";
+        ename = "epic";
         version = "20170209.1623";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
@@ -24438,6 +25390,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "epkg";
+        ename = "epkg";
         version = "20180627.1353";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -24463,6 +25416,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epl";
+        ename = "epl";
         version = "20180205.1249";
         src = fetchFromGitHub {
           owner = "cask";
@@ -24489,6 +25443,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epm";
+        ename = "epm";
         version = "20161027.34";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -24515,6 +25470,7 @@
                             , org }:
       melpaBuild {
         pname = "epresent";
+        ename = "epresent";
         version = "20160410.1901";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -24539,6 +25495,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "eprime-mode";
+        ename = "eprime-mode";
         version = "20140513.1116";
         src = fetchFromGitHub {
           owner = "AndrewHynes";
@@ -24564,6 +25521,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "eproject";
+        ename = "eproject";
         version = "20180312.942";
         src = fetchFromGitHub {
           owner = "jrockway";
@@ -24588,6 +25546,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "erc-colorize";
+        ename = "erc-colorize";
         version = "20170107.539";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -24613,6 +25572,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erc-crypt";
+        ename = "erc-crypt";
         version = "20161228.739";
         src = fetchFromGitHub {
           owner = "atomontage";
@@ -24641,6 +25601,7 @@
                                   , s }:
       melpaBuild {
         pname = "erc-hipchatify";
+        ename = "erc-hipchatify";
         version = "20170314.937";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
@@ -24664,6 +25625,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "erc-hl-nicks";
+        ename = "erc-hl-nicks";
         version = "20180415.1246";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -24688,6 +25650,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erc-image";
+        ename = "erc-image";
         version = "20180522.724";
         src = fetchFromGitHub {
           owner = "kidd";
@@ -24714,6 +25677,7 @@
                                      , switch-buffer-functions }:
       melpaBuild {
         pname = "erc-scrolltoplace";
+        ename = "erc-scrolltoplace";
         version = "20180607.2306";
         src = fetchFromGitLab {
           owner = "jgkamat";
@@ -24738,6 +25702,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "erc-social-graph";
+        ename = "erc-social-graph";
         version = "20150508.504";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -24764,6 +25729,7 @@
                                       , seq }:
       melpaBuild {
         pname = "erc-status-sidebar";
+        ename = "erc-status-sidebar";
         version = "20171223.1324";
         src = fetchFromGitHub {
           owner = "drewbarbs";
@@ -24788,6 +25754,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "erc-terminal-notifier";
+        ename = "erc-terminal-notifier";
         version = "20140115.224";
         src = fetchFromGitHub {
           owner = "julienXX";
@@ -24812,6 +25779,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "erc-track-score";
+        ename = "erc-track-score";
         version = "20130328.515";
         src = fetchFromGitHub {
           owner = "jd";
@@ -24836,6 +25804,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erc-tweet";
+        ename = "erc-tweet";
         version = "20150920.558";
         src = fetchFromGitHub {
           owner = "kidd";
@@ -24862,6 +25831,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "erc-twitch";
+        ename = "erc-twitch";
         version = "20170426.2306";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -24886,6 +25856,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "erc-view-log";
+        ename = "erc-view-log";
         version = "20140227.1239";
         src = fetchFromGitHub {
           owner = "Niluge-KiWi";
@@ -24910,6 +25881,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "erc-youtube";
+        ename = "erc-youtube";
         version = "20150603.1436";
         src = fetchFromGitHub {
           owner = "kidd";
@@ -24935,6 +25907,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "erc-yt";
+        ename = "erc-yt";
         version = "20150426.549";
         src = fetchFromGitHub {
           owner = "yhvh";
@@ -24959,6 +25932,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ercn";
+        ename = "ercn";
         version = "20150523.803";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -24987,6 +25961,7 @@
                            , xml-plus }:
       melpaBuild {
         pname = "ereader";
+        ename = "ereader";
         version = "20170809.2201";
         src = fetchFromGitHub {
           owner = "bddean";
@@ -25011,6 +25986,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "eredis";
+        ename = "eredis";
         version = "20180221.1313";
         src = fetchFromGitHub {
           owner = "justinhj";
@@ -25036,6 +26012,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erefactor";
+        ename = "erefactor";
         version = "20160121.159";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25063,6 +26040,7 @@
                                   , undo-tree }:
       melpaBuild {
         pname = "ergoemacs-mode";
+        ename = "ergoemacs-mode";
         version = "20180709.645";
         src = fetchFromGitHub {
           owner = "ergoemacs";
@@ -25089,6 +26067,7 @@
                                     , powerline }:
       melpaBuild {
         pname = "ergoemacs-status";
+        ename = "ergoemacs-status";
         version = "20160317.2238";
         src = fetchFromGitHub {
           owner = "ergoemacs";
@@ -25114,6 +26093,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "erlang";
+        ename = "erlang";
         version = "20180618.557";
         src = fetchFromGitHub {
           owner = "erlang";
@@ -25139,6 +26119,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eros";
+        ename = "eros";
         version = "20180414.2318";
         src = fetchFromGitHub {
           owner = "xiongtx";
@@ -25163,6 +26144,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ert-async";
+        ename = "ert-async";
         version = "20151011.659";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -25187,6 +26169,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ert-expectations";
+        ename = "ert-expectations";
         version = "20121009.34";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -25212,6 +26195,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ert-junit";
+        ename = "ert-junit";
         version = "20180511.1548";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
@@ -25239,6 +26223,7 @@
                                 , s }:
       melpaBuild {
         pname = "ert-modeline";
+        ename = "ert-modeline";
         version = "20140115.215";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -25269,6 +26254,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "ert-runner";
+        ename = "ert-runner";
         version = "20180215.857";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -25294,6 +26280,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "es-lib";
+        ename = "es-lib";
         version = "20141111.1030";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -25323,6 +26310,7 @@
                            , spark }:
       melpaBuild {
         pname = "es-mode";
+        ename = "es-mode";
         version = "20180212.1425";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -25349,6 +26337,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "es-windows";
+        ename = "es-windows";
         version = "20140211.104";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -25374,6 +26363,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "esa";
+        ename = "esa";
         version = "20180403.825";
         src = fetchFromGitHub {
           owner = "nabinno";
@@ -25400,6 +26390,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "esh-autosuggest";
+        ename = "esh-autosuggest";
         version = "20171223.1855";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -25424,6 +26415,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "esh-buf-stack";
+        ename = "esh-buf-stack";
         version = "20140107.218";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -25449,6 +26441,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "esh-help";
+        ename = "esh-help";
         version = "20170829.2111";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -25473,6 +26466,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "eshell-autojump";
+        ename = "eshell-autojump";
         version = "20150927.24";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -25498,6 +26492,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "eshell-bookmark";
+        ename = "eshell-bookmark";
         version = "20170922.814";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -25524,6 +26519,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "eshell-did-you-mean";
+        ename = "eshell-did-you-mean";
         version = "20150915.1252";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -25550,6 +26546,7 @@
                                        , s }:
       melpaBuild {
         pname = "eshell-fixed-prompt";
+        ename = "eshell-fixed-prompt";
         version = "20170804.635";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -25574,6 +26571,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "eshell-fringe-status";
+        ename = "eshell-fringe-status";
         version = "20170117.1516";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -25601,6 +26599,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "eshell-git-prompt";
+        ename = "eshell-git-prompt";
         version = "20170909.752";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -25625,6 +26624,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "eshell-prompt-extras";
+        ename = "eshell-prompt-extras";
         version = "20180109.2234";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -25650,6 +26650,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "eshell-up";
+        ename = "eshell-up";
         version = "20170425.1037";
         src = fetchFromGitHub {
           owner = "peterwvj";
@@ -25675,6 +26676,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "eshell-z";
+        ename = "eshell-z";
         version = "20170116.2038";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -25699,6 +26701,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eslint-fix";
+        ename = "eslint-fix";
         version = "20180514.0";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -25725,6 +26728,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "eslintd-fix";
+        ename = "eslintd-fix";
         version = "20180429.755";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -25749,6 +26753,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "espresso-theme";
+        ename = "espresso-theme";
         version = "20170716.813";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -25776,6 +26781,7 @@
                           , s }:
       melpaBuild {
         pname = "espuds";
+        ename = "espuds";
         version = "20160905.600";
         src = fetchFromGitHub {
           owner = "ecukes";
@@ -25801,6 +26807,7 @@
                            , pcsv }:
       melpaBuild {
         pname = "esqlite";
+        ename = "esqlite";
         version = "20151206.406";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25827,6 +26834,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "esqlite-helm";
+        ename = "esqlite-helm";
         version = "20151116.50";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25851,12 +26859,13 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ess";
-        version = "20180713.1416";
+        ename = "ess";
+        version = "20180720.131";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "a7458e17cc768b0f30f76d0c9d7f78948bb48d0a";
-          sha256 = "1bj8xdwg8l8xnrx7gc9viddm19lhf45zxshbcb3mchb6mq9b2vff";
+          rev = "167b61af2c36c300a2f1f9ecea2c670af685451b";
+          sha256 = "1bcd652hq7j5azhmy470ha4279c5ld8db1gcqww65clay7gvnbkg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
@@ -25878,6 +26887,7 @@
                                    , popup }:
       melpaBuild {
         pname = "ess-R-data-view";
+        ename = "ess-R-data-view";
         version = "20130509.458";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -25904,6 +26914,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ess-smart-equals";
+        ename = "ess-smart-equals";
         version = "20150201.2201";
         src = fetchFromGitHub {
           owner = "genovese";
@@ -25929,6 +26940,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "ess-smart-underscore";
+        ename = "ess-smart-underscore";
         version = "20170222.1715";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -25956,6 +26968,7 @@
                             , s }:
       melpaBuild {
         pname = "ess-view";
+        ename = "ess-view";
         version = "20180525.1503";
         src = fetchFromGitHub {
           owner = "GioBo";
@@ -25982,6 +26995,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "esup";
+        ename = "esup";
         version = "20180506.1639";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -26006,6 +27020,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "esxml";
+        ename = "esxml";
         version = "20171129.7";
         src = fetchFromGitHub {
           owner = "tali713";
@@ -26033,6 +27048,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "etable";
+        ename = "etable";
         version = "20161028.1309";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -26060,6 +27076,7 @@
                                   , xterm-color }:
       melpaBuild {
         pname = "eterm-256color";
+        ename = "eterm-256color";
         version = "20180520.523";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -26084,6 +27101,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ethan-wspace";
+        ename = "ethan-wspace";
         version = "20170507.1330";
         src = fetchFromGitHub {
           owner = "glasserc";
@@ -26112,6 +27130,7 @@
                                 , s }:
       melpaBuild {
         pname = "euslisp-mode";
+        ename = "euslisp-mode";
         version = "20170830.1229";
         src = fetchFromGitHub {
           owner = "iory";
@@ -26136,6 +27155,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "eval-expr";
+        ename = "eval-expr";
         version = "20120618.2347";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -26163,6 +27183,7 @@
                                 , paredit }:
       melpaBuild {
         pname = "eval-in-repl";
+        ename = "eval-in-repl";
         version = "20171122.543";
         src = fetchFromGitHub {
           owner = "kaz-yos";
@@ -26189,6 +27210,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "eval-sexp-fu";
+        ename = "eval-sexp-fu";
         version = "20180509.1903";
         src = fetchFromGitHub {
           owner = "hchbaw";
@@ -26214,6 +27236,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evalator";
+        ename = "evalator";
         version = "20160212.1728";
         src = fetchFromGitHub {
           owner = "seanirby";
@@ -26240,6 +27263,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "evalator-clojure";
+        ename = "evalator-clojure";
         version = "20160208.1348";
         src = fetchFromGitHub {
           owner = "seanirby";
@@ -26267,6 +27291,7 @@
                             , polymode }:
       melpaBuild {
         pname = "eve-mode";
+        ename = "eve-mode";
         version = "20170822.1531";
         src = fetchFromGitHub {
           owner = "witheve";
@@ -26295,6 +27320,7 @@
                         , undo-tree }:
       melpaBuild {
         pname = "evil";
+        ename = "evil";
         version = "20180517.1300";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -26321,6 +27347,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-anzu";
+        ename = "evil-anzu";
         version = "20170123.2318";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -26346,6 +27373,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-args";
+        ename = "evil-args";
         version = "20140329.1429";
         src = fetchFromGitHub {
           owner = "wcsmith";
@@ -26374,6 +27402,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evil-avy";
+        ename = "evil-avy";
         version = "20150908.48";
         src = fetchFromGitHub {
           owner = "louy2";
@@ -26403,6 +27432,7 @@
                                      , smartparens }:
       melpaBuild {
         pname = "evil-cleverparens";
+        ename = "evil-cleverparens";
         version = "20170717.2113";
         src = fetchFromGitHub {
           owner = "luxbock";
@@ -26430,6 +27460,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-colemak-basics";
+        ename = "evil-colemak-basics";
         version = "20170425.509";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -26456,6 +27487,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "evil-colemak-minimal";
+        ename = "evil-colemak-minimal";
         version = "20171006.617";
         src = fetchFromGitHub {
           owner = "bmallred";
@@ -26483,12 +27515,13 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-collection";
-        version = "20180715.836";
+        ename = "evil-collection";
+        version = "20180722.1341";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-collection";
-          rev = "0deb319515267371a43b605957817fb033f1cbf3";
-          sha256 = "178iq1kks1j0g9q11q68fynhg2y36ya1w6mc5xlzm97vkcrh5cr0";
+          rev = "6e2c59c2ddd8b2d953c6152f467f41bc213533ee";
+          sha256 = "0m6dg93shs3fl3qimiiicjwfyrk6mhghb7qgd21qgdnb3yj4fw5j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
@@ -26508,6 +27541,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-commentary";
+        ename = "evil-commentary";
         version = "20170413.751";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -26533,6 +27567,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-dvorak";
+        ename = "evil-dvorak";
         version = "20160416.1141";
         src = fetchFromGitHub {
           owner = "jbranso";
@@ -26560,6 +27595,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-easymotion";
+        ename = "evil-easymotion";
         version = "20180113.2254";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -26585,6 +27621,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-ediff";
+        ename = "evil-ediff";
         version = "20170724.1223";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -26612,6 +27649,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-embrace";
+        ename = "evil-embrace";
         version = "20160519.1129";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -26639,6 +27677,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-escape";
+        ename = "evil-escape";
         version = "20180623.2019";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -26665,6 +27704,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-exchange";
+        ename = "evil-exchange";
         version = "20170510.1959";
         src = fetchFromGitHub {
           owner = "Dewdrops";
@@ -26691,12 +27731,13 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-expat";
-        version = "20180302.657";
+        ename = "evil-expat";
+        version = "20180719.116";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-expat";
-          rev = "523edb0d1fd6ad17b777c1893cbe1f4857469a4d";
-          sha256 = "10irfd546pz0sz0ckfms1md37ni44p7i12imii5ck13hga7grv7i";
+          rev = "3ff831784c5f301330ecced5ebd43cce42980d2b";
+          sha256 = "15x9fl7r25dygzkc6hhw5yzza7g2dwgr7gvvim913ahnzk5g9nag";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat";
@@ -26716,6 +27757,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-extra-operator";
+        ename = "evil-extra-operator";
         version = "20161212.2003";
         src = fetchFromGitHub {
           owner = "Dewdrops";
@@ -26742,6 +27784,7 @@
                                          , pinyinlib }:
       melpaBuild {
         pname = "evil-find-char-pinyin";
+        ename = "evil-find-char-pinyin";
         version = "20160514.1341";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -26770,6 +27813,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "evil-fringe-mark";
+        ename = "evil-fringe-mark";
         version = "20180619.1534";
         src = fetchFromGitHub {
           owner = "Andrew-William-Smith";
@@ -26796,6 +27840,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-god-state";
+        ename = "evil-god-state";
         version = "20141116.1855";
         src = fetchFromGitHub {
           owner = "gridaphobe";
@@ -26822,6 +27867,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-goggles";
+        ename = "evil-goggles";
         version = "20180702.353";
         src = fetchFromGitHub {
           owner = "edkolev";
@@ -26848,6 +27894,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "evil-iedit-state";
+        ename = "evil-iedit-state";
         version = "20180606.2258";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -26874,6 +27921,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "evil-indent-plus";
+        ename = "evil-indent-plus";
         version = "20151109.1106";
         src = fetchFromGitHub {
           owner = "TheBB";
@@ -26899,6 +27947,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "evil-indent-textobject";
+        ename = "evil-indent-textobject";
         version = "20130831.1519";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -26924,6 +27973,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-leader";
+        ename = "evil-leader";
         version = "20140606.543";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -26950,6 +28000,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-ledger";
+        ename = "evil-ledger";
         version = "20170905.519";
         src = fetchFromGitHub {
           owner = "atheriel";
@@ -26976,6 +28027,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-lion";
+        ename = "evil-lion";
         version = "20170810.2314";
         src = fetchFromGitHub {
           owner = "edkolev";
@@ -27003,6 +28055,7 @@
                                    , smartparens }:
       melpaBuild {
         pname = "evil-lisp-state";
+        ename = "evil-lisp-state";
         version = "20160403.1948";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -27030,6 +28083,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-lispy";
+        ename = "evil-lispy";
         version = "20170304.259";
         src = fetchFromGitHub {
           owner = "sp3ctum";
@@ -27056,6 +28110,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-magit";
+        ename = "evil-magit";
         version = "20180702.853";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -27081,6 +28136,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "evil-mark-replace";
+        ename = "evil-mark-replace";
         version = "20150424.18";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -27106,6 +28162,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-matchit";
+        ename = "evil-matchit";
         version = "20180526.557";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -27133,6 +28190,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "evil-mc";
+        ename = "evil-mc";
         version = "20180603.2033";
         src = fetchFromGitHub {
           owner = "gabesoft";
@@ -27162,6 +28220,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-mc-extras";
+        ename = "evil-mc-extras";
         version = "20170202.849";
         src = fetchFromGitHub {
           owner = "gabesoft";
@@ -27188,6 +28247,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-mu4e";
+        ename = "evil-mu4e";
         version = "20180613.339";
         src = fetchFromGitHub {
           owner = "JorisE";
@@ -27216,6 +28276,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-multiedit";
+        ename = "evil-multiedit";
         version = "20180209.1819";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -27241,12 +28302,13 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20180411.640";
+        ename = "evil-nerd-commenter";
+        version = "20180722.1625";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "34d411715ead5829d6d8969511047feb703b067e";
-          sha256 = "0ax846dy2hbrbvkj7nzfkcl5i1x9rga8bvg0ln55ivhq0iiy1lkv";
+          rev = "275c95c89cc09c7096bd6fd0deabd49f29634f5d";
+          sha256 = "07k4d1dy1nm9g54zwqzdqhibz2a2zfi7q27z7k8wq0ibjph96nwh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -27265,6 +28327,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-numbers";
+        ename = "evil-numbers";
         version = "20140606.551";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -27291,6 +28354,7 @@
                                , opener }:
       melpaBuild {
         pname = "evil-opener";
+        ename = "evil-opener";
         version = "20161207.1010";
         src = fetchFromGitHub {
           owner = "0robustus1";
@@ -27317,6 +28381,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evil-org";
+        ename = "evil-org";
         version = "20180323.1606";
         src = fetchFromGitHub {
           owner = "Somelauw";
@@ -27343,6 +28408,7 @@
                                 , paredit }:
       melpaBuild {
         pname = "evil-paredit";
+        ename = "evil-paredit";
         version = "20150413.1348";
         src = fetchFromGitHub {
           owner = "roman";
@@ -27368,6 +28434,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-quickscope";
+        ename = "evil-quickscope";
         version = "20160202.1124";
         src = fetchFromGitHub {
           owner = "blorbx";
@@ -27394,6 +28461,7 @@
                               , projectile-rails }:
       melpaBuild {
         pname = "evil-rails";
+        ename = "evil-rails";
         version = "20160621.1558";
         src = fetchFromGitHub {
           owner = "antono";
@@ -27420,6 +28488,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "evil-replace-with-char";
+        ename = "evil-replace-with-char";
         version = "20180324.1506";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -27445,6 +28514,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "evil-replace-with-register";
+        ename = "evil-replace-with-register";
         version = "20170713.225";
         src = fetchFromGitHub {
           owner = "Dewdrops";
@@ -27470,6 +28540,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evil-rsi";
+        ename = "evil-rsi";
         version = "20160221.1304";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -27495,6 +28566,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-search-highlight-persist";
+        ename = "evil-search-highlight-persist";
         version = "20170522.2034";
         src = fetchFromGitHub {
           owner = "naclander";
@@ -27522,6 +28594,7 @@
                                     , smartparens }:
       melpaBuild {
         pname = "evil-smartparens";
+        ename = "evil-smartparens";
         version = "20171210.713";
         src = fetchFromGitHub {
           owner = "expez";
@@ -27549,6 +28622,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-snipe";
+        ename = "evil-snipe";
         version = "20180503.141";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -27574,6 +28648,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-space";
+        ename = "evil-space";
         version = "20151208.428";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -27601,6 +28676,7 @@
                                           , string-inflection }:
       melpaBuild {
         pname = "evil-string-inflection";
+        ename = "evil-string-inflection";
         version = "20180313.1055";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -27626,6 +28702,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-surround";
+        ename = "evil-surround";
         version = "20180102.601";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -27651,6 +28728,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-swap-keys";
+        ename = "evil-swap-keys";
         version = "20170726.1120";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -27677,6 +28755,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-tabs";
+        ename = "evil-tabs";
         version = "20160217.720";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -27702,6 +28781,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-terminal-cursor-changer";
+        ename = "evil-terminal-cursor-changer";
         version = "20170401.142";
         src = fetchFromGitHub {
           owner = "7696122";
@@ -27727,6 +28807,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "evil-test-helpers";
+        ename = "evil-test-helpers";
         version = "20180109.1040";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -27753,6 +28834,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "evil-text-object-python";
+        ename = "evil-text-object-python";
         version = "20160815.141";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -27779,6 +28861,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "evil-textobj-anyblock";
+        ename = "evil-textobj-anyblock";
         version = "20170905.1207";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -27806,6 +28889,7 @@
                                        , names }:
       melpaBuild {
         pname = "evil-textobj-column";
+        ename = "evil-textobj-column";
         version = "20170905.1205";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -27831,6 +28915,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-tutor";
+        ename = "evil-tutor";
         version = "20150102.2250";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -27857,6 +28942,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-tutor-ja";
+        ename = "evil-tutor-ja";
         version = "20160916.1832";
         src = fetchFromGitHub {
           owner = "kenjimyzk";
@@ -27884,6 +28970,7 @@
                                     , vimish-fold }:
       melpaBuild {
         pname = "evil-vimish-fold";
+        ename = "evil-vimish-fold";
         version = "20171030.451";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -27910,6 +28997,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "evil-visual-mark-mode";
+        ename = "evil-visual-mark-mode";
         version = "20150202.1000";
         src = fetchFromGitHub {
           owner = "roman";
@@ -27935,6 +29023,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-visual-replace";
+        ename = "evil-visual-replace";
         version = "20171015.2313";
         src = fetchFromGitHub {
           owner = "troyp";
@@ -27960,6 +29049,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-visualstar";
+        ename = "evil-visualstar";
         version = "20160222.1648";
         src = fetchFromGitHub {
           owner = "bling";
@@ -27986,6 +29076,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "evm";
+        ename = "evm";
         version = "20141007.456";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -28010,6 +29101,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ewmctrl";
+        ename = "ewmctrl";
         version = "20170921.1917";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -28034,6 +29126,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "eww-lnum";
+        ename = "eww-lnum";
         version = "20150102.712";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -28060,6 +29153,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "exato";
+        ename = "exato";
         version = "20180305.242";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -28084,6 +29178,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "exec-path-from-shell";
+        ename = "exec-path-from-shell";
         version = "20180323.1904";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -28109,6 +29204,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "exiftool";
+        ename = "exiftool";
         version = "20170822.1432";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
@@ -28133,6 +29229,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "exotica-theme";
+        ename = "exotica-theme";
         version = "20180212.1529";
         src = fetchFromGitHub {
           owner = "jbharat";
@@ -28157,6 +29254,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "expand-line";
+        ename = "expand-line";
         version = "20151005.1907";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -28181,6 +29279,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "expand-region";
+        ename = "expand-region";
         version = "20180625.939";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -28206,6 +29305,7 @@
                            , string-utils }:
       melpaBuild {
         pname = "express";
+        ename = "express";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -28231,6 +29331,7 @@
                                  , s }:
       melpaBuild {
         pname = "exsqlaim-mode";
+        ename = "exsqlaim-mode";
         version = "20170607.303";
         src = fetchFromGitHub {
           owner = "ahmadnazir";
@@ -28256,6 +29357,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "extempore-mode";
+        ename = "extempore-mode";
         version = "20180104.2221";
         src = fetchFromGitHub {
           owner = "extemporelang";
@@ -28280,6 +29382,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "extend-dnd";
+        ename = "extend-dnd";
         version = "20151122.1050";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -28305,6 +29408,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "extmap";
+        ename = "extmap";
         version = "20180205.1047";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -28330,6 +29434,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "exwm-edit";
+        ename = "exwm-edit";
         version = "20180629.137";
         src = fetchFromGitHub {
           owner = "agzam";
@@ -28356,6 +29461,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "exwm-surf";
+        ename = "exwm-surf";
         version = "20171204.340";
         src = fetchFromGitHub {
           owner = "ecraven";
@@ -28387,6 +29493,7 @@
                           , switch-window }:
       melpaBuild {
         pname = "exwm-x";
+        ename = "exwm-x";
         version = "20180227.257";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -28421,6 +29528,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "eyebrowse";
+        ename = "eyebrowse";
         version = "20180514.1219";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -28447,6 +29555,7 @@
                          , s }:
       melpaBuild {
         pname = "eyuml";
+        ename = "eyuml";
         version = "20141028.1527";
         src = fetchFromGitHub {
           owner = "antham";
@@ -28473,6 +29582,7 @@
                                     , s }:
       melpaBuild {
         pname = "ez-query-replace";
+        ename = "ez-query-replace";
         version = "20170814.621";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -28497,6 +29607,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "eziam-theme";
+        ename = "eziam-theme";
         version = "20180414.329";
         src = fetchFromGitHub {
           owner = "thblt";
@@ -28523,6 +29634,7 @@
                      , s }:
       melpaBuild {
         pname = "f";
+        ename = "f";
         version = "20180106.122";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -28550,6 +29662,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "f3";
+        ename = "f3";
         version = "20180130.358";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -28574,6 +29687,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "fabric";
+        ename = "fabric";
         version = "20171115.2256";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -28598,6 +29712,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "face-explorer";
+        ename = "face-explorer";
         version = "20170710.1201";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -28622,6 +29737,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "faceup";
+        ename = "faceup";
         version = "20170925.1246";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -28647,6 +29763,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "factlog";
+        ename = "factlog";
         version = "20130209.1740";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -28671,6 +29788,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "faff-theme";
+        ename = "faff-theme";
         version = "20180702.1023";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
@@ -28695,6 +29813,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fakespace";
+        ename = "fakespace";
         version = "20120817.1706";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -28722,6 +29841,7 @@
                          , noflet }:
       melpaBuild {
         pname = "fakir";
+        ename = "fakir";
         version = "20140729.952";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -28747,6 +29867,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fancy-battery";
+        ename = "fancy-battery";
         version = "20150101.404";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -28771,6 +29892,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fancy-narrow";
+        ename = "fancy-narrow";
         version = "20171030.1716";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -28795,6 +29917,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "farmhouse-theme";
+        ename = "farmhouse-theme";
         version = "20160713.1544";
         src = fetchFromGitHub {
           owner = "mattly";
@@ -28819,6 +29942,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "fasd";
+        ename = "fasd";
         version = "20180605.2205";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/emacs-fasd.git";
@@ -28844,6 +29968,7 @@
                            , w3m }:
       melpaBuild {
         pname = "fastdef";
+        ename = "fastdef";
         version = "20160713.629";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -28868,6 +29993,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "fastnav";
+        ename = "fastnav";
         version = "20120211.657";
         src = fetchFromGitHub {
           owner = "gleber";
@@ -28892,6 +30018,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "faust-mode";
+        ename = "faust-mode";
         version = "20180205.126";
         src = fetchFromGitHub {
           owner = "rukano";
@@ -28918,6 +30045,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "faustine";
+        ename = "faustine";
         version = "20171122.402";
         src = fetchgit {
           url = "https://bitbucket.org/yphil/faustine";
@@ -28941,6 +30069,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fcitx";
+        ename = "fcitx";
         version = "20170913.1900";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -28965,6 +30094,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fcopy";
+        ename = "fcopy";
         version = "20150304.603";
         src = fetchFromGitHub {
           owner = "ataka";
@@ -28989,6 +30119,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "feature-mode";
+        ename = "feature-mode";
         version = "20170907.748";
         src = fetchFromGitHub {
           owner = "michaelklishin";
@@ -29013,6 +30144,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "feebleline";
+        ename = "feebleline";
         version = "20180604.515";
         src = fetchFromGitHub {
           owner = "tautologyclub";
@@ -29037,6 +30169,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "fennel-mode";
+        ename = "fennel-mode";
         version = "20180509.1852";
         src = fetchFromGitLab {
           owner = "technomancy";
@@ -29061,6 +30194,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fetch";
+        ename = "fetch";
         version = "20131130.2330";
         src = fetchFromGitHub {
           owner = "crshd";
@@ -29085,6 +30219,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fic-mode";
+        ename = "fic-mode";
         version = "20180603.1335";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -29109,6 +30244,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "fifo-class";
+        ename = "fifo-class";
         version = "20160424.2258";
         src = fetchFromGitHub {
           owner = "mola-T";
@@ -29133,6 +30269,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "figlet";
+        ename = "figlet";
         version = "20160218.1437";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/figlet";
@@ -29159,6 +30296,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "filelock";
+        ename = "filelock";
         version = "20180524.1515";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -29183,6 +30321,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "fill-column-indicator";
+        ename = "fill-column-indicator";
         version = "20171209.1124";
         src = fetchFromGitHub {
           owner = "alpaker";
@@ -29208,6 +30347,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "fill-function-arguments";
+        ename = "fill-function-arguments";
         version = "20180427.1002";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -29232,6 +30372,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fillcode";
+        ename = "fillcode";
         version = "20171029.925";
         src = fetchFromGitHub {
           owner = "snarfed";
@@ -29260,6 +30401,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "finalize";
+        ename = "finalize";
         version = "20170418.1245";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -29285,6 +30427,7 @@
                                         , pinyinlib }:
       melpaBuild {
         pname = "find-by-pinyin-dired";
+        ename = "find-by-pinyin-dired";
         version = "20180209.1818";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -29311,6 +30454,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "find-file-in-project";
+        ename = "find-file-in-project";
         version = "20180705.1832";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -29335,6 +30479,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "find-file-in-repository";
+        ename = "find-file-in-repository";
         version = "20151113.519";
         src = fetchFromGitHub {
           owner = "hoffstaetter";
@@ -29359,6 +30504,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "find-temp-file";
+        ename = "find-temp-file";
         version = "20170107.539";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -29383,6 +30529,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "find-things-fast";
+        ename = "find-things-fast";
         version = "20150519.1526";
         src = fetchFromGitHub {
           owner = "eglaysher";
@@ -29407,6 +30554,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "findr";
+        ename = "findr";
         version = "20130127.1232";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -29431,6 +30579,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "fingers";
+        ename = "fingers";
         version = "20160817.129";
         src = fetchFromGitHub {
           owner = "fgeller";
@@ -29457,6 +30606,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fiplr";
+        ename = "fiplr";
         version = "20140723.2345";
         src = fetchFromGitHub {
           owner = "grizzl";
@@ -29482,6 +30632,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "firecode-theme";
+        ename = "firecode-theme";
         version = "20170808.611";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -29509,6 +30660,7 @@
                                       , popwin }:
       melpaBuild {
         pname = "firefox-controller";
+        ename = "firefox-controller";
         version = "20160320.1147";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -29533,6 +30685,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fireplace";
+        ename = "fireplace";
         version = "20160811.519";
         src = fetchFromGitHub {
           owner = "johanvts";
@@ -29557,6 +30710,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "firestarter";
+        ename = "firestarter";
         version = "20161219.523";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -29582,6 +30736,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "firrtl-mode";
+        ename = "firrtl-mode";
         version = "20180221.1555";
         src = fetchFromGitHub {
           owner = "ibm";
@@ -29606,6 +30761,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "fish-completion";
+        ename = "fish-completion";
         version = "20180616.1223";
         src = fetchFromGitLab {
           owner = "Ambrevar";
@@ -29631,6 +30787,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fish-mode";
+        ename = "fish-mode";
         version = "20180306.818";
         src = fetchFromGitHub {
           owner = "wwwjfy";
@@ -29656,6 +30813,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fix-input";
+        ename = "fix-input";
         version = "20171231.2220";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -29680,6 +30838,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "fix-muscle-memory";
+        ename = "fix-muscle-memory";
         version = "20160822.2139";
         src = fetchFromGitHub {
           owner = "jonnay";
@@ -29706,6 +30865,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fix-word";
+        ename = "fix-word";
         version = "20171231.2215";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -29736,6 +30896,7 @@
                           , tabulated-list ? null }:
       melpaBuild {
         pname = "fixmee";
+        ename = "fixmee";
         version = "20150223.555";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -29768,6 +30929,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "flame";
+        ename = "flame";
         version = "20180303.1216";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -29792,6 +30954,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "flappymacs";
+        ename = "flappymacs";
         version = "20171023.304";
         src = fetchFromGitHub {
           owner = "taksatou";
@@ -29816,6 +30979,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flash-region";
+        ename = "flash-region";
         version = "20130923.1117";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -29841,6 +31005,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "flatland-black-theme";
+        ename = "flatland-black-theme";
         version = "20170808.612";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -29865,6 +31030,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flatland-theme";
+        ename = "flatland-theme";
         version = "20171113.721";
         src = fetchFromGitHub {
           owner = "gchp";
@@ -29890,6 +31056,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flatui-dark-theme";
+        ename = "flatui-dark-theme";
         version = "20170513.722";
         src = fetchFromGitHub {
           owner = "theasp";
@@ -29914,6 +31081,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flatui-theme";
+        ename = "flatui-theme";
         version = "20160618.1827";
         src = fetchFromGitHub {
           owner = "john2x";
@@ -29938,6 +31106,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flex-autopair";
+        ename = "flex-autopair";
         version = "20120809.518";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -29965,6 +31134,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flex-compile";
+        ename = "flex-compile";
         version = "20180528.853";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -29989,6 +31159,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flex-isearch";
+        ename = "flex-isearch";
         version = "20170308.1210";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/flex-isearch";
@@ -30013,6 +31184,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "flim";
+        ename = "flim";
         version = "20180328.1624";
         src = fetchFromGitHub {
           owner = "wanderlust";
@@ -30039,6 +31211,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "flimenu";
+        ename = "flimenu";
         version = "20170417.1847";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -30063,6 +31236,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fliptext";
+        ename = "fliptext";
         version = "20171124.1256";
         src = fetchFromGitHub {
           owner = "andre-r";
@@ -30089,6 +31263,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "floobits";
+        ename = "floobits";
         version = "20170802.1500";
         src = fetchFromGitHub {
           owner = "Floobits";
@@ -30114,6 +31289,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flow-minor-mode";
+        ename = "flow-minor-mode";
         version = "20180315.1124";
         src = fetchFromGitHub {
           owner = "an-sh";
@@ -30140,6 +31316,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "flower";
+        ename = "flower";
         version = "20180618.1222";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
@@ -30166,6 +31343,7 @@
                                , osc }:
       melpaBuild {
         pname = "fluxus-mode";
+        ename = "fluxus-mode";
         version = "20170210.1141";
         src = fetchFromGitHub {
           owner = "defaultxr";
@@ -30191,6 +31369,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "flx";
+        ename = "flx";
         version = "20151030.1112";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -30217,6 +31396,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "flx-ido";
+        ename = "flx-ido";
         version = "20180117.719";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -30244,6 +31424,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flx-isearch";
+        ename = "flx-isearch";
         version = "20180102.2114";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -30273,12 +31454,13 @@
                             , seq }:
       melpaBuild {
         pname = "flycheck";
-        version = "20180614.1235";
+        ename = "flycheck";
+        version = "20180720.247";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "0995b0bb3f518c7350f1428860c0fc7eeaee3c46";
-          sha256 = "03qbgvvlk4icp5zf243m0araxw5ylkqs37h72z028vlk9n370c6s";
+          rev = "740d6670384e76f86d675d8ab00ff21eb7e09fcb";
+          sha256 = "0hskxg1q100j55wszlzscy90vhcaylz40b2wqkrad4bflx4dv2x5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -30298,6 +31480,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-apertium";
+        ename = "flycheck-apertium";
         version = "20160406.618";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -30324,6 +31507,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-ats2";
+        ename = "flycheck-ats2";
         version = "20170225.836";
         src = fetchFromGitHub {
           owner = "drvink";
@@ -30350,6 +31534,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-bashate";
+        ename = "flycheck-bashate";
         version = "20160629.2140";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -30377,6 +31562,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-cask";
+        ename = "flycheck-cask";
         version = "20160928.226";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -30403,6 +31589,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "flycheck-checkbashisms";
+        ename = "flycheck-checkbashisms";
         version = "20160224.906";
         src = fetchFromGitHub {
           owner = "Gnouc";
@@ -30429,6 +31616,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-checkpatch";
+        ename = "flycheck-checkpatch";
         version = "20170217.225";
         src = fetchFromGitHub {
           owner = "zpp0";
@@ -30455,6 +31643,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "flycheck-clang-analyzer";
+        ename = "flycheck-clang-analyzer";
         version = "20180225.2039";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -30480,6 +31669,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-clang-tidy";
+        ename = "flycheck-clang-tidy";
         version = "20171024.108";
         src = fetchFromGitHub {
           owner = "ch1bo";
@@ -30507,6 +31697,7 @@
                                        , seq }:
       melpaBuild {
         pname = "flycheck-clangcheck";
+        ename = "flycheck-clangcheck";
         version = "20150712.10";
         src = fetchFromGitHub {
           owner = "kumar8600";
@@ -30535,12 +31726,13 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-clojure";
-        version = "20170221.1354";
+        ename = "flycheck-clojure";
+        version = "20180721.712";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44";
-          sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3";
+          rev = "7c856615f91868171af270f4fed08d52988f9596";
+          sha256 = "0r2v4gica86z0va5i5xcs5aisi47ywzg2sg6rp7z6yg7aprcnfll";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -30562,6 +31754,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "flycheck-color-mode-line";
+        ename = "flycheck-color-mode-line";
         version = "20171121.2307";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -30589,6 +31782,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-coverity";
+        ename = "flycheck-coverity";
         version = "20170703.1759";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -30614,6 +31808,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-credo";
+        ename = "flycheck-credo";
         version = "20170526.845";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -30639,6 +31834,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-crystal";
+        ename = "flycheck-crystal";
         version = "20180626.1942";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
@@ -30665,6 +31861,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "flycheck-css-colorguard";
+        ename = "flycheck-css-colorguard";
         version = "20161031.422";
         src = fetchFromGitHub {
           owner = "Simplify";
@@ -30691,6 +31888,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-cstyle";
+        ename = "flycheck-cstyle";
         version = "20160905.1641";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -30716,6 +31914,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-cython";
+        ename = "flycheck-cython";
         version = "20170724.258";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -30742,6 +31941,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-d-unittest";
+        ename = "flycheck-d-unittest";
         version = "20160521.2117";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -30768,6 +31968,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dedukti";
+        ename = "flycheck-dedukti";
         version = "20171103.512";
         src = fetchFromGitHub {
           owner = "rafoo";
@@ -30793,6 +31994,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "flycheck-demjsonlint";
+        ename = "flycheck-demjsonlint";
         version = "20161114.2318";
         src = fetchFromGitHub {
           owner = "z4139jq";
@@ -30818,6 +32020,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dialyxir";
+        ename = "flycheck-dialyxir";
         version = "20170515.825";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -30843,6 +32046,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dialyzer";
+        ename = "flycheck-dialyzer";
         version = "20160326.730";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -30869,6 +32073,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dmd-dub";
+        ename = "flycheck-dmd-dub";
         version = "20180625.935";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -30894,6 +32099,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dogma";
+        ename = "flycheck-dogma";
         version = "20170124.2321";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -30920,6 +32126,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dtrace";
+        ename = "flycheck-dtrace";
         version = "20180126.1135";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -30945,6 +32152,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-elixir";
+        ename = "flycheck-elixir";
         version = "20171122.507";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -30971,6 +32179,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flycheck-elm";
+        ename = "flycheck-elm";
         version = "20160717.257";
         src = fetchFromGitHub {
           owner = "bsermons";
@@ -30997,6 +32206,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-flawfinder";
+        ename = "flycheck-flawfinder";
         version = "20170115.1927";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -31023,6 +32233,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-flow";
+        ename = "flycheck-flow";
         version = "20180216.1156";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -31049,6 +32260,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-ghcmod";
+        ename = "flycheck-ghcmod";
         version = "20150113.2232";
         src = fetchFromGitHub {
           owner = "scturtle";
@@ -31075,6 +32287,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "flycheck-golangci-lint";
+        ename = "flycheck-golangci-lint";
         version = "20180711.117";
         src = fetchFromGitHub {
           owner = "weijiangan";
@@ -31101,6 +32314,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flycheck-gometalinter";
+        ename = "flycheck-gometalinter";
         version = "20180424.241";
         src = fetchFromGitHub {
           owner = "favadi";
@@ -31127,6 +32341,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-gradle";
+        ename = "flycheck-gradle";
         version = "20180403.33";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -31157,6 +32372,7 @@
                                     , seq }:
       melpaBuild {
         pname = "flycheck-haskell";
+        ename = "flycheck-haskell";
         version = "20180611.1442";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31183,6 +32399,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "flycheck-hdevtools";
+        ename = "flycheck-hdevtools";
         version = "20160926.2";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31209,6 +32426,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-inline";
+        ename = "flycheck-inline";
         version = "20180529.614";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31236,6 +32454,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-irony";
+        ename = "flycheck-irony";
         version = "20180604.1452";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -31262,6 +32481,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-jest";
+        ename = "flycheck-jest";
         version = "20180410.2028";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -31287,6 +32507,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-joker";
+        ename = "flycheck-joker";
         version = "20180712.2102";
         src = fetchFromGitHub {
           owner = "candid82";
@@ -31313,6 +32534,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-julia";
+        ename = "flycheck-julia";
         version = "20170729.1441";
         src = fetchFromGitHub {
           owner = "gdkrmr";
@@ -31338,6 +32560,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-kotlin";
+        ename = "flycheck-kotlin";
         version = "20170122.337";
         src = fetchFromGitHub {
           owner = "whirm";
@@ -31363,6 +32586,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-ledger";
+        ename = "flycheck-ledger";
         version = "20180125.31";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -31389,6 +32613,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-lilypond";
+        ename = "flycheck-lilypond";
         version = "20171203.532";
         src = fetchFromGitHub {
           owner = "hinrik";
@@ -31414,6 +32639,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-liquidhs";
+        ename = "flycheck-liquidhs";
         version = "20170412.1626";
         src = fetchFromGitHub {
           owner = "ucsd-progsys";
@@ -31441,6 +32667,7 @@
                                     , s }:
       melpaBuild {
         pname = "flycheck-mercury";
+        ename = "flycheck-mercury";
         version = "20151122.2334";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31467,6 +32694,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flycheck-mix";
+        ename = "flycheck-mix";
         version = "20170118.630";
         src = fetchFromGitHub {
           owner = "tomekowal";
@@ -31493,6 +32721,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-mmark";
+        ename = "flycheck-mmark";
         version = "20180203.932";
         src = fetchFromGitHub {
           owner = "mmark-md";
@@ -31518,6 +32747,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-mypy";
+        ename = "flycheck-mypy";
         version = "20180518.4";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -31544,6 +32774,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flycheck-nim";
+        ename = "flycheck-nim";
         version = "20160714.2128";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
@@ -31570,6 +32801,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-nimsuggest";
+        ename = "flycheck-nimsuggest";
         version = "20171027.1508";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -31596,6 +32828,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-objc-clang";
+        ename = "flycheck-objc-clang";
         version = "20180410.422";
         src = fetchFromGitHub {
           owner = "GyazSquare";
@@ -31624,6 +32857,7 @@
                                   , merlin }:
       melpaBuild {
         pname = "flycheck-ocaml";
+        ename = "flycheck-ocaml";
         version = "20170730.1453";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31650,6 +32884,7 @@
                                     , package-lint }:
       melpaBuild {
         pname = "flycheck-package";
+        ename = "flycheck-package";
         version = "20161111.1451";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -31676,6 +32911,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-perl6";
+        ename = "flycheck-perl6";
         version = "20180509.1501";
         src = fetchFromGitHub {
           owner = "hinrik";
@@ -31703,6 +32939,7 @@
                                     , phpstan }:
       melpaBuild {
         pname = "flycheck-phpstan";
+        ename = "flycheck-phpstan";
         version = "20180430.358";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -31730,6 +32967,7 @@
                                        , s }:
       melpaBuild {
         pname = "flycheck-pkg-config";
+        ename = "flycheck-pkg-config";
         version = "20180430.1543";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -31757,6 +32995,7 @@
                                      , plantuml-mode }:
       melpaBuild {
         pname = "flycheck-plantuml";
+        ename = "flycheck-plantuml";
         version = "20171017.1811";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -31782,6 +33021,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-pony";
+        ename = "flycheck-pony";
         version = "20160501.1417";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -31809,6 +33049,7 @@
                                       , popup }:
       melpaBuild {
         pname = "flycheck-popup-tip";
+        ename = "flycheck-popup-tip";
         version = "20170812.1651";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31836,6 +33077,7 @@
                                     , pos-tip }:
       melpaBuild {
         pname = "flycheck-pos-tip";
+        ename = "flycheck-pos-tip";
         version = "20180610.915";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -31863,6 +33105,7 @@
                                      , posframe }:
       melpaBuild {
         pname = "flycheck-posframe";
+        ename = "flycheck-posframe";
         version = "20180321.2307";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -31888,6 +33131,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-prospector";
+        ename = "flycheck-prospector";
         version = "20180523.2150";
         src = fetchFromGitHub {
           owner = "chocoelho";
@@ -31917,6 +33161,7 @@
                                        , seq }:
       melpaBuild {
         pname = "flycheck-purescript";
+        ename = "flycheck-purescript";
         version = "20161121.907";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -31942,12 +33187,13 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-pycheckers";
-        version = "20180710.1157";
+        ename = "flycheck-pycheckers";
+        version = "20180717.2300";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "ca24cf5d0a1d09c6c99ce7e58fb0b62a0f2cc320";
-          sha256 = "1bj7pm6kz5dqz4r53i1ll9i9r7p1p0lvpfw7gawi8k75wfhl3xwd";
+          rev = "f85eb69318729689d09f69e955d800ddc6124d6a";
+          sha256 = "0dw342g27mhnfpv83ni7gjx47issmk94hinrakjaf91vm3bjwaag";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -31967,6 +33213,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-pyflakes";
+        ename = "flycheck-pyflakes";
         version = "20170330.1611";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -31992,6 +33239,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-rebar3";
+        ename = "flycheck-rebar3";
         version = "20161030.615";
         src = fetchFromGitHub {
           owner = "joedevivo";
@@ -32019,6 +33267,7 @@
                                   , rtags }:
       melpaBuild {
         pname = "flycheck-rtags";
+        ename = "flycheck-rtags";
         version = "20180619.124";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -32048,6 +33297,7 @@
                                  , seq }:
       melpaBuild {
         pname = "flycheck-rust";
+        ename = "flycheck-rust";
         version = "20180327.945";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -32074,6 +33324,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-stack";
+        ename = "flycheck-stack";
         version = "20160520.244";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -32102,6 +33353,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flycheck-status-emoji";
+        ename = "flycheck-status-emoji";
         version = "20180330.1625";
         src = fetchFromGitHub {
           owner = "liblit";
@@ -32128,6 +33380,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-swift";
+        ename = "flycheck-swift";
         version = "20170128.2149";
         src = fetchFromGitHub {
           owner = "swift-emacs";
@@ -32154,6 +33407,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-swift3";
+        ename = "flycheck-swift3";
         version = "20180411.652";
         src = fetchFromGitHub {
           owner = "GyazSquare";
@@ -32180,6 +33434,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "flycheck-swiftlint";
+        ename = "flycheck-swiftlint";
         version = "20180312.1656";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -32206,6 +33461,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flycheck-tcl";
+        ename = "flycheck-tcl";
         version = "20180327.559";
         src = fetchFromGitHub {
           owner = "nwidger";
@@ -32233,6 +33489,7 @@
                                 , popup }:
       melpaBuild {
         pname = "flycheck-tip";
+        ename = "flycheck-tip";
         version = "20171020.348";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -32259,6 +33516,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-title";
+        ename = "flycheck-title";
         version = "20170216.1546";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -32286,6 +33544,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-vale";
+        ename = "flycheck-vale";
         version = "20180308.2243";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -32312,6 +33571,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-xcode";
+        ename = "flycheck-xcode";
         version = "20180121.2251";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -32337,6 +33597,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-yamllint";
+        ename = "flycheck-yamllint";
         version = "20170325.1035";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -32363,6 +33624,7 @@
                                  , yang-mode }:
       melpaBuild {
         pname = "flycheck-yang";
+        ename = "flycheck-yang";
         version = "20180312.1131";
         src = fetchFromGitHub {
           owner = "andaru";
@@ -32392,6 +33654,7 @@
                                  , ycmd }:
       melpaBuild {
         pname = "flycheck-ycmd";
+        ename = "flycheck-ycmd";
         version = "20180207.843";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -32417,6 +33680,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-coffee";
+        ename = "flymake-coffee";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32442,6 +33706,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flymake-cppcheck";
+        ename = "flymake-cppcheck";
         version = "20140415.557";
         src = fetchFromGitHub {
           owner = "senda-akiha";
@@ -32467,6 +33732,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flymake-css";
+        ename = "flymake-css";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32492,6 +33758,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-cursor";
+        ename = "flymake-cursor";
         version = "20120322.1057";
         src = fetchFromGitHub {
           owner = "flymake";
@@ -32516,6 +33783,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-easy";
+        ename = "flymake-easy";
         version = "20140818.55";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32540,6 +33808,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-elixir";
+        ename = "flymake-elixir";
         version = "20130810.717";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -32564,6 +33833,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flymake-gjshint";
+        ename = "flymake-gjshint";
         version = "20130327.532";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -32588,6 +33858,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "flymake-go";
+        ename = "flymake-go";
         version = "20150714.33";
         src = fetchFromGitHub {
           owner = "robert-zaremba";
@@ -32613,6 +33884,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "flymake-google-cpplint";
+        ename = "flymake-google-cpplint";
         version = "20140205.525";
         src = fetchFromGitHub {
           owner = "senda-akiha";
@@ -32638,6 +33910,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-haml";
+        ename = "flymake-haml";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32663,6 +33936,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flymake-haskell-multi";
+        ename = "flymake-haskell-multi";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32688,6 +33962,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flymake-hlint";
+        ename = "flymake-hlint";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32713,6 +33988,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-jshint";
+        ename = "flymake-jshint";
         version = "20140319.1500";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -32738,6 +34014,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-jslint";
+        ename = "flymake-jslint";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32763,6 +34040,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-json";
+        ename = "flymake-json";
         version = "20180511.211";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32789,6 +34067,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-less";
+        ename = "flymake-less";
         version = "20151110.2338";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32813,6 +34092,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flymake-lua";
+        ename = "flymake-lua";
         version = "20170128.1754";
         src = fetchFromGitHub {
           owner = "sroccaserra";
@@ -32838,6 +34118,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "flymake-perlcritic";
+        ename = "flymake-perlcritic";
         version = "20120328.114";
         src = fetchFromGitHub {
           owner = "illusori";
@@ -32863,6 +34144,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flymake-php";
+        ename = "flymake-php";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32888,6 +34170,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flymake-phpcs";
+        ename = "flymake-phpcs";
         version = "20140712.2331";
         src = fetchFromGitHub {
           owner = "senda-akiha";
@@ -32913,6 +34196,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-puppet";
+        ename = "flymake-puppet";
         version = "20170731.2254";
         src = fetchFromGitHub {
           owner = "benprew";
@@ -32938,6 +34222,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "flymake-python-pyflakes";
+        ename = "flymake-python-pyflakes";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32963,6 +34248,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-ruby";
+        ename = "flymake-ruby";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -32988,6 +34274,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-rust";
+        ename = "flymake-rust";
         version = "20170729.1439";
         src = fetchFromGitHub {
           owner = "jxs";
@@ -33013,6 +34300,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-sass";
+        ename = "flymake-sass";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -33038,6 +34326,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flymake-shell";
+        ename = "flymake-shell";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -33063,6 +34352,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flymake-solidity";
+        ename = "flymake-solidity";
         version = "20170804.2344";
         src = fetchFromGitHub {
           owner = "kootenpv";
@@ -33088,6 +34378,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-vala";
+        ename = "flymake-vala";
         version = "20150325.2231";
         src = fetchFromGitHub {
           owner = "daniellawrence";
@@ -33113,6 +34404,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-yaml";
+        ename = "flymake-yaml";
         version = "20130423.848";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -33138,6 +34430,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "flymd";
+        ename = "flymd";
         version = "20160617.514";
         src = fetchFromGitHub {
           owner = "mola-T";
@@ -33162,6 +34455,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "flyparens";
+        ename = "flyparens";
         version = "20140723.1146";
         src = fetchFromGitHub {
           owner = "jiyoo";
@@ -33186,6 +34480,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct";
+        ename = "flyspell-correct";
         version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -33212,6 +34507,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct-helm";
+        ename = "flyspell-correct-helm";
         version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -33238,6 +34534,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct-ivy";
+        ename = "flyspell-correct-ivy";
         version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -33264,6 +34561,7 @@
                                           , popup }:
       melpaBuild {
         pname = "flyspell-correct-popup";
+        ename = "flyspell-correct-popup";
         version = "20180427.1135";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -33288,6 +34586,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flyspell-lazy";
+        ename = "flyspell-lazy";
         version = "20180224.1306";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -33313,6 +34612,7 @@
                                   , popup }:
       melpaBuild {
         pname = "flyspell-popup";
+        ename = "flyspell-popup";
         version = "20170529.115";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -33339,6 +34639,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fm-bookmarks";
+        ename = "fm-bookmarks";
         version = "20170104.916";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -33367,6 +34668,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "fn";
+        ename = "fn";
         version = "20170209.1804";
         src = fetchFromGitHub {
           owner = "troyp";
@@ -33393,6 +34695,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "focus";
+        ename = "focus";
         version = "20171203.2103";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -33418,6 +34721,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "focus-autosave-mode";
+        ename = "focus-autosave-mode";
         version = "20160519.1416";
         src = fetchFromGitHub {
           owner = "Vifon";
@@ -33443,6 +34747,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "foggy-night-theme";
+        ename = "foggy-night-theme";
         version = "20160209.708";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -33467,6 +34772,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fold-dwim";
+        ename = "fold-dwim";
         version = "20140208.837";
         src = fetchFromGitHub {
           owner = "emacsattic";
@@ -33492,6 +34798,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fold-dwim-org";
+        ename = "fold-dwim-org";
         version = "20131203.551";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -33516,6 +34823,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fold-this";
+        ename = "fold-this";
         version = "20180224.40";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -33540,6 +34848,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "folding";
+        ename = "folding";
         version = "20170925.838";
         src = fetchFromGitHub {
           owner = "jaalto";
@@ -33565,6 +34874,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "font-lock-profiler";
+        ename = "font-lock-profiler";
         version = "20170208.1208";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -33590,6 +34900,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "font-lock-studio";
+        ename = "font-lock-studio";
         version = "20170127.1251";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -33616,6 +34927,7 @@
                               , persistent-soft }:
       melpaBuild {
         pname = "font-utils";
+        ename = "font-utils";
         version = "20150806.1051";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -33641,6 +34953,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "fontawesome";
+        ename = "fontawesome";
         version = "20170305.556";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -33666,6 +34979,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fontify-face";
+        ename = "fontify-face";
         version = "20180420.924";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -33691,6 +35005,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "forecast";
+        ename = "forecast";
         version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
@@ -33715,6 +35030,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "foreign-regexp";
+        ename = "foreign-regexp";
         version = "20180224.321";
         src = fetchFromGitHub {
           owner = "k-talo";
@@ -33744,6 +35060,7 @@
                                 , s }:
       melpaBuild {
         pname = "foreman-mode";
+        ename = "foreman-mode";
         version = "20170725.722";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -33769,6 +35086,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "forest-blue-theme";
+        ename = "forest-blue-theme";
         version = "20160627.142";
         src = fetchFromGitHub {
           owner = "olkinn";
@@ -33793,6 +35111,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "form-feed";
+        ename = "form-feed";
         version = "20160102.1453";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -33818,12 +35137,13 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "format-all";
-        version = "20180710.329";
+        ename = "format-all";
+        version = "20180722.159";
         src = fetchFromGitHub {
           owner = "lassik";
           repo = "emacs-format-all-the-code";
-          rev = "f2b76915a50b25f0bdeb5f644fe842a8684943e2";
-          sha256 = "099yp2p4j4ig5zhpxlir5khshp846smnv3cbmcqcjz84zsxxnjlg";
+          rev = "6b0bd2fadb8f672e93bc58f2de94be97f5a1b6d6";
+          sha256 = "1y2y2ank4bll0h4bsd0d60aqq5hlylna9zvg18q3n68isqagn7zh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all";
@@ -33842,6 +35162,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "format-sql";
+        ename = "format-sql";
         version = "20150422.633";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -33866,6 +35187,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "forth-mode";
+        ename = "forth-mode";
         version = "20170527.1230";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
@@ -33894,6 +35216,7 @@
                           , python-environment }:
       melpaBuild {
         pname = "fortpy";
+        ename = "fortpy";
         version = "20150715.1332";
         src = fetchFromGitHub {
           owner = "rosenbrockc";
@@ -33918,6 +35241,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "fortune-cookie";
+        ename = "fortune-cookie";
         version = "20170407.1517";
         src = fetchFromGitHub {
           owner = "andschwa";
@@ -33943,6 +35267,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fountain-mode";
+        ename = "fountain-mode";
         version = "20180715.145";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -33968,6 +35293,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fraktur-mode";
+        ename = "fraktur-mode";
         version = "20160814.1927";
         src = fetchFromGitHub {
           owner = "grettke";
@@ -33993,6 +35319,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "frame-local";
+        ename = "frame-local";
         version = "20180330.240";
         src = fetchFromGitHub {
           owner = "sebastiencs";
@@ -34019,6 +35346,7 @@
                               , s }:
       melpaBuild {
         pname = "frame-mode";
+        ename = "frame-mode";
         version = "20170419.1427";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -34046,6 +35374,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "frame-purpose";
+        ename = "frame-purpose";
         version = "20180623.1757";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -34071,6 +35400,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "frame-tag";
+        ename = "frame-tag";
         version = "20170110.1606";
         src = fetchFromGitHub {
           owner = "liangzan";
@@ -34098,6 +35428,7 @@
                                     , s }:
       melpaBuild {
         pname = "frames-only-mode";
+        ename = "frames-only-mode";
         version = "20180114.1048";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -34123,6 +35454,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "frameshot";
+        ename = "frameshot";
         version = "20180228.408";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -34148,6 +35480,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "framesize";
+        ename = "framesize";
         version = "20131017.1432";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -34175,6 +35508,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "frecency";
+        ename = "frecency";
         version = "20170908.2331";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -34200,6 +35534,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "free-keys";
+        ename = "free-keys";
         version = "20160726.1350";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -34224,6 +35559,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "fringe-current-line";
+        ename = "fringe-current-line";
         version = "20140110.2011";
         src = fetchFromGitHub {
           owner = "kyanagi";
@@ -34248,6 +35584,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fringe-helper";
+        ename = "fringe-helper";
         version = "20140620.1409";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -34272,6 +35609,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "fsbot-data-browser";
+        ename = "fsbot-data-browser";
         version = "20160921.833";
         src = fetchFromGitHub {
           owner = "benaiah";
@@ -34303,6 +35641,7 @@
                                , s }:
       melpaBuild {
         pname = "fsharp-mode";
+        ename = "fsharp-mode";
         version = "20180518.1120";
         src = fetchFromGitHub {
           owner = "rneatherway";
@@ -34342,6 +35681,7 @@
                               , yasnippet }:
       melpaBuild {
         pname = "fstar-mode";
+        ename = "fstar-mode";
         version = "20180713.1329";
         src = fetchFromGitHub {
           owner = "FStarLang";
@@ -34376,6 +35716,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "fuel";
+        ename = "fuel";
         version = "20180224.1411";
         src = fetchFromGitHub {
           owner = "factor";
@@ -34401,6 +35742,7 @@
                         , seq }:
       melpaBuild {
         pname = "fuff";
+        ename = "fuff";
         version = "20170202.703";
         src = fetchFromGitHub {
           owner = "joelmo";
@@ -34425,6 +35767,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "full-ack";
+        ename = "full-ack";
         version = "20140223.932";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -34450,6 +35793,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fullframe";
+        ename = "fullframe";
         version = "20170816.303";
         src = fetchFromGitHub {
           owner = "tomterl";
@@ -34475,6 +35819,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "function-args";
+        ename = "function-args";
         version = "20171031.1004";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -34500,6 +35845,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "fuo";
+        ename = "fuo";
         version = "20180314.948";
         src = fetchFromGitHub {
           owner = "cosven";
@@ -34524,6 +35870,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "furl";
+        ename = "furl";
         version = "20150508.2016";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -34549,6 +35896,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "futhark-mode";
+        ename = "futhark-mode";
         version = "20180619.949";
         src = fetchFromGitHub {
           owner = "diku-dk";
@@ -34573,6 +35921,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fuzzy";
+        ename = "fuzzy";
         version = "20150729.2037";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -34597,6 +35946,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fvwm-mode";
+        ename = "fvwm-mode";
         version = "20160411.438";
         src = fetchFromGitHub {
           owner = "theBlackDragon";
@@ -34621,6 +35971,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fwb-cmds";
+        ename = "fwb-cmds";
         version = "20180318.1519";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -34646,6 +35997,7 @@
                              , s }:
       melpaBuild {
         pname = "fxrd-mode";
+        ename = "fxrd-mode";
         version = "20170728.1101";
         src = fetchFromGitHub {
           owner = "msherry";
@@ -34670,6 +36022,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fyure";
+        ename = "fyure";
         version = "20130216.514";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -34695,6 +36048,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "fzf";
+        ename = "fzf";
         version = "20180618.1845";
         src = fetchFromGitHub {
           owner = "bling";
@@ -34722,6 +36076,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gams-ac";
+        ename = "gams-ac";
         version = "20180423.226";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
@@ -34747,6 +36102,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gams-mode";
+        ename = "gams-mode";
         version = "20180416.206";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
@@ -34771,6 +36127,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "gandalf-theme";
+        ename = "gandalf-theme";
         version = "20130809.247";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -34795,6 +36152,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "gap-mode";
+        ename = "gap-mode";
         version = "20160204.736";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/gap-mode";
@@ -34818,6 +36176,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "gather";
+        ename = "gather";
         version = "20141230.538";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -34843,6 +36202,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "gdscript-mode";
+        ename = "gdscript-mode";
         version = "20180117.2056";
         src = fetchFromGitHub {
           owner = "AdamBark";
@@ -34869,6 +36229,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "geben";
+        ename = "geben";
         version = "20170801.551";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -34896,6 +36257,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "geben-helm-projectile";
+        ename = "geben-helm-projectile";
         version = "20160610.1759";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -34921,6 +36283,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "geeknote";
+        ename = "geeknote";
         version = "20160717.549";
         src = fetchFromGitHub {
           owner = "avendael";
@@ -34945,6 +36308,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "geiser";
+        ename = "geiser";
         version = "20180626.440";
         src = fetchFromGitLab {
           owner = "jaor";
@@ -34971,6 +36335,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "general";
+        ename = "general";
         version = "20180628.1112";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -34999,6 +36364,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "genrnc";
+        ename = "genrnc";
         version = "20140612.537";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -35023,6 +36389,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "german-holidays";
+        ename = "german-holidays";
         version = "20161011.13";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -35049,6 +36416,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "gerrit-download";
+        ename = "gerrit-download";
         version = "20150714.708";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -35075,6 +36443,7 @@
                       , s }:
       melpaBuild {
         pname = "gf";
+        ename = "gf";
         version = "20180606.1455";
         src = fetchFromGitHub {
           owner = "grammaticalframework";
@@ -35099,6 +36468,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ggo-mode";
+        ename = "ggo-mode";
         version = "20130524.443";
         src = fetchFromGitHub {
           owner = "mkjunker";
@@ -35125,6 +36495,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ggtags";
+        ename = "ggtags";
         version = "20180418.657";
         src = fetchFromGitHub {
           owner = "leoliu";
@@ -35153,6 +36524,7 @@
                       , pcache }:
       melpaBuild {
         pname = "gh";
+        ename = "gh";
         version = "20180308.1338";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -35178,6 +36550,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "gh-md";
+        ename = "gh-md";
         version = "20151207.940";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -35203,6 +36576,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ghc";
+        ename = "ghc";
         version = "20180121.418";
         src = fetchFromGitHub {
           owner = "DanielG";
@@ -35228,6 +36602,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ghc-imported-from";
+        ename = "ghc-imported-from";
         version = "20141124.1132";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -35254,6 +36629,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ghci-completion";
+        ename = "ghci-completion";
         version = "20151125.457";
         src = fetchFromGitHub {
           owner = "manzyuk";
@@ -35278,6 +36654,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gherkin-mode";
+        ename = "gherkin-mode";
         version = "20171224.553";
         src = fetchFromGitHub {
           owner = "candera";
@@ -35303,6 +36680,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ghost-blog";
+        ename = "ghost-blog";
         version = "20171023.42";
         src = fetchFromGitHub {
           owner = "javaguirre";
@@ -35327,6 +36705,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ghq";
+        ename = "ghq";
         version = "20160803.857";
         src = fetchFromGitHub {
           owner = "rcoedo";
@@ -35353,6 +36732,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ghub";
+        ename = "ghub";
         version = "20180715.1159";
         src = fetchFromGitHub {
           owner = "magit";
@@ -35380,6 +36760,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ghub-plus";
+        ename = "ghub+";
         version = "20180602.1545";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -35405,6 +36786,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gif-screencast";
+        ename = "gif-screencast";
         version = "20180616.1230";
         src = fetchFromGitLab {
           owner = "Ambrevar";
@@ -35429,6 +36811,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gift-mode";
+        ename = "gift-mode";
         version = "20180530.535";
         src = fetchFromGitHub {
           owner = "csrhodes";
@@ -35455,6 +36838,7 @@
                                , polymode }:
       melpaBuild {
         pname = "gildas-mode";
+        ename = "gildas-mode";
         version = "20150919.1501";
         src = fetchFromGitHub {
           owner = "smaret";
@@ -35481,6 +36865,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "gist";
+        ename = "gist";
         version = "20171127.2006";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -35508,6 +36893,7 @@
                        , s }:
       melpaBuild {
         pname = "git";
+        ename = "git";
         version = "20140128.241";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -35532,6 +36918,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "git-annex";
+        ename = "git-annex";
         version = "20180427.856";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -35557,6 +36944,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-attr";
+        ename = "git-attr";
         version = "20180204.15";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -35581,6 +36969,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "git-auto-commit-mode";
+        ename = "git-auto-commit-mode";
         version = "20161229.817";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -35605,6 +36994,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "git-blamed";
+        ename = "git-blamed";
         version = "20161028.1226";
         src = fetchFromGitHub {
           owner = "tsgates";
@@ -35631,6 +37021,7 @@
                                , with-editor }:
       melpaBuild {
         pname = "git-command";
+        ename = "git-command";
         version = "20160111.503";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -35658,6 +37049,7 @@
                               , with-editor }:
       melpaBuild {
         pname = "git-commit";
+        ename = "git-commit";
         version = "20180713.1444";
         src = fetchFromGitHub {
           owner = "magit";
@@ -35687,6 +37079,7 @@
                                            , s }:
       melpaBuild {
         pname = "git-commit-insert-issue";
+        ename = "git-commit-insert-issue";
         version = "20171102.1141";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
@@ -35711,6 +37104,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-dwim";
+        ename = "git-dwim";
         version = "20170126.414";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -35736,6 +37130,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "git-gutter";
+        ename = "git-gutter";
         version = "20161105.656";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -35764,6 +37159,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-fringe";
+        ename = "git-gutter-fringe";
         version = "20170112.2133";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -35790,6 +37186,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-fringe-plus";
+        ename = "git-gutter-fringe+";
         version = "20140729.403";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -35816,6 +37213,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-plus";
+        ename = "git-gutter+";
         version = "20151204.923";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -35841,6 +37239,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "git-io";
+        ename = "git-io";
         version = "20180317.1052";
         src = fetchFromGitHub {
           owner = "tejasbubane";
@@ -35866,6 +37265,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-lens";
+        ename = "git-lens";
         version = "20180328.717";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -35891,6 +37291,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-link";
+        ename = "git-link";
         version = "20180708.943";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -35917,6 +37318,7 @@
                                  , popup }:
       melpaBuild {
         pname = "git-messenger";
+        ename = "git-messenger";
         version = "20170101.2040";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -35944,6 +37346,7 @@
                                   , s }:
       melpaBuild {
         pname = "git-msg-prefix";
+        ename = "git-msg-prefix";
         version = "20180118.646";
         src = fetchFromGitHub {
           owner = "kidd";
@@ -35968,6 +37371,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "git-ps1-mode";
+        ename = "git-ps1-mode";
         version = "20180413.247";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -35993,6 +37397,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "git-timemachine";
+        ename = "git-timemachine";
         version = "20180607.120";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -36018,6 +37423,7 @@
                                        , s }:
       melpaBuild {
         pname = "git-wip-timemachine";
+        ename = "git-wip-timemachine";
         version = "20150408.306";
         src = fetchFromGitHub {
           owner = "itsjeyd";
@@ -36042,6 +37448,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "gitattributes-mode";
+        ename = "gitattributes-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
@@ -36066,6 +37473,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gitconfig";
+        ename = "gitconfig";
         version = "20130718.235";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -36090,6 +37498,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gitconfig-mode";
+        ename = "gitconfig-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
@@ -36115,6 +37524,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "github-browse-file";
+        ename = "github-browse-file";
         version = "20160205.627";
         src = fetchFromGitHub {
           owner = "osener";
@@ -36142,6 +37552,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "github-clone";
+        ename = "github-clone";
         version = "20160622.2010";
         src = fetchFromGitHub {
           owner = "dgtized";
@@ -36169,6 +37580,7 @@
                                , package-build }:
       melpaBuild {
         pname = "github-elpa";
+        ename = "github-elpa";
         version = "20180704.2247";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -36194,6 +37606,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "github-issues";
+        ename = "github-issues";
         version = "20160616.1141";
         src = fetchFromGitHub {
           owner = "inkel";
@@ -36218,6 +37631,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "github-modern-theme";
+        ename = "github-modern-theme";
         version = "20171109.451";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
@@ -36243,6 +37657,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "github-notifier";
+        ename = "github-notifier";
         version = "20180420.2016";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -36271,6 +37686,7 @@
                                       , request }:
       melpaBuild {
         pname = "github-pullrequest";
+        ename = "github-pullrequest";
         version = "20170115.2216";
         src = fetchFromGitHub {
           owner = "jakoblind";
@@ -36297,6 +37713,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "github-search";
+        ename = "github-search";
         version = "20170823.2023";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -36323,6 +37740,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "github-stars";
+        ename = "github-stars";
         version = "20180328.433";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -36347,6 +37765,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "github-theme";
+        ename = "github-theme";
         version = "20170630.1501";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
@@ -36371,6 +37790,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gitignore-mode";
+        ename = "gitignore-mode";
         version = "20180318.1256";
         src = fetchFromGitHub {
           owner = "magit";
@@ -36396,6 +37816,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gitignore-templates";
+        ename = "gitignore-templates";
         version = "20180327.626";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -36424,6 +37845,7 @@
                           , s }:
       melpaBuild {
         pname = "gitlab";
+        ename = "gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -36450,6 +37872,7 @@
                                   , yaml-mode }:
       melpaBuild {
         pname = "gitlab-ci-mode";
+        ename = "gitlab-ci-mode";
         version = "20180604.1503";
         src = fetchFromGitLab {
           owner = "joewreschnig";
@@ -36477,6 +37900,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "gitlab-ci-mode-flycheck";
+        ename = "gitlab-ci-mode-flycheck";
         version = "20180604.1504";
         src = fetchFromGitLab {
           owner = "joewreschnig";
@@ -36505,6 +37929,7 @@
                                   , s }:
       melpaBuild {
         pname = "gitolite-clone";
+        ename = "gitolite-clone";
         version = "20160609.1655";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -36530,6 +37955,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "gitpatch";
+        ename = "gitpatch";
         version = "20170721.2110";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -36556,6 +37982,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "gitter";
+        ename = "gitter";
         version = "20180122.56";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -36581,6 +38008,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gl-conf-mode";
+        ename = "gl-conf-mode";
         version = "20170714.610";
         src = fetchFromGitHub {
           owner = "llloret";
@@ -36607,6 +38035,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "glab";
+        ename = "glab";
         version = "20180419.308";
         src = fetchFromGitHub {
           owner = "magit";
@@ -36631,6 +38060,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "glsl-mode";
+        ename = "glsl-mode";
         version = "20170927.736";
         src = fetchFromGitHub {
           owner = "jimhourihan";
@@ -36656,6 +38086,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "gmail-message-mode";
+        ename = "gmail-message-mode";
         version = "20160627.1147";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -36680,6 +38111,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "gmail2bbdb";
+        ename = "gmail2bbdb";
         version = "20170423.444";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -36705,6 +38137,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gmpl-mode";
+        ename = "gmpl-mode";
         version = "20171031.1354";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -36729,6 +38162,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gnome-calendar";
+        ename = "gnome-calendar";
         version = "20161110.456";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -36756,6 +38190,7 @@
                            , s }:
       melpaBuild {
         pname = "gnomenm";
+        ename = "gnomenm";
         version = "20150316.1218";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -36780,6 +38215,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "gntp";
+        ename = "gntp";
         version = "20141024.1950";
         src = fetchFromGitHub {
           owner = "tekai";
@@ -36805,6 +38241,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gnu-apl-mode";
+        ename = "gnu-apl-mode";
         version = "20180129.2300";
         src = fetchFromGitHub {
           owner = "lokedhs";
@@ -36829,6 +38266,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gnuplot";
+        ename = "gnuplot";
         version = "20141231.1337";
         src = fetchFromGitHub {
           owner = "bruceravel";
@@ -36853,6 +38291,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gnuplot-mode";
+        ename = "gnuplot-mode";
         version = "20171013.916";
         src = fetchFromGitHub {
           owner = "mkmcc";
@@ -36877,6 +38316,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "gnus-alias";
+        ename = "gnus-alias";
         version = "20150315.1742";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -36902,6 +38342,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gnus-desktop-notify";
+        ename = "gnus-desktop-notify";
         version = "20180623.838";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -36926,6 +38367,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gnus-select-account";
+        ename = "gnus-select-account";
         version = "20170721.2211";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -36950,6 +38392,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "gnus-summary-ext";
+        ename = "gnus-summary-ext";
         version = "20180113.516";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -36976,6 +38419,7 @@
                                  , yaxception }:
       melpaBuild {
         pname = "gnus-x-gm-raw";
+        ename = "gnus-x-gm-raw";
         version = "20140610.31";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -37001,6 +38445,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "go";
+        ename = "go";
         version = "20161110.1849";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -37027,6 +38472,7 @@
                                , s }:
       melpaBuild {
         pname = "go-add-tags";
+        ename = "go-add-tags";
         version = "20161123.427";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -37052,6 +38498,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "go-autocomplete";
+        ename = "go-autocomplete";
         version = "20170626.323";
         src = fetchFromGitHub {
           owner = "nsf";
@@ -37078,6 +38525,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "go-complete";
+        ename = "go-complete";
         version = "20151015.228";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -37104,6 +38552,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "go-direx";
+        ename = "go-direx";
         version = "20150315.1843";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -37129,6 +38578,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "go-dlv";
+        ename = "go-dlv";
         version = "20160517.1346";
         src = fetchFromGitHub {
           owner = "benma";
@@ -37155,6 +38605,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "go-eldoc";
+        ename = "go-eldoc";
         version = "20170305.627";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -37179,6 +38630,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "go-errcheck";
+        ename = "go-errcheck";
         version = "20160722.1743";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -37204,6 +38656,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "go-fill-struct";
+        ename = "go-fill-struct";
         version = "20171224.1931";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -37230,6 +38683,7 @@
                                , s }:
       melpaBuild {
         pname = "go-gen-test";
+        ename = "go-gen-test";
         version = "20171022.2058";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -37255,6 +38709,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "go-gopath";
+        ename = "go-gopath";
         version = "20160705.334";
         src = fetchFromGitHub {
           owner = "iced";
@@ -37281,6 +38736,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-guru";
+        ename = "go-guru";
         version = "20180628.310";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -37307,6 +38763,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-impl";
+        ename = "go-impl";
         version = "20170125.752";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -37331,6 +38788,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "go-imports";
+        ename = "go-imports";
         version = "20180709.2228";
         src = fetchFromGitHub {
           owner = "yasushi-saito";
@@ -37355,6 +38813,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-mode";
+        ename = "go-mode";
         version = "20180327.830";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -37382,6 +38841,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "go-playground";
+        ename = "go-playground";
         version = "20170226.43";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -37414,6 +38874,7 @@
                                      , s }:
       melpaBuild {
         pname = "go-playground-cli";
+        ename = "go-playground-cli";
         version = "20160503.214";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -37443,6 +38904,7 @@
                                  , projectile }:
       melpaBuild {
         pname = "go-projectile";
+        ename = "go-projectile";
         version = "20170302.1705";
         src = fetchFromGitHub {
           owner = "dougm";
@@ -37468,6 +38930,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "go-rename";
+        ename = "go-rename";
         version = "20180626.2348";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -37494,6 +38957,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "go-scratch";
+        ename = "go-scratch";
         version = "20150809.2140";
         src = fetchFromGitHub {
           owner = "shosti";
@@ -37519,6 +38983,7 @@
                                , yasnippet }:
       melpaBuild {
         pname = "go-snippets";
+        ename = "go-snippets";
         version = "20180112.2211";
         src = fetchFromGitHub {
           owner = "toumorokoshi";
@@ -37543,6 +39008,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "go-stacktracer";
+        ename = "go-stacktracer";
         version = "20150430.1442";
         src = fetchFromGitHub {
           owner = "samertm";
@@ -37569,6 +39035,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "go-tag";
+        ename = "go-tag";
         version = "20180226.2011";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -37594,6 +39061,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "gobgen";
+        ename = "gobgen";
         version = "20161020.823";
         src = fetchFromGitHub {
           owner = "gergelypolonkai";
@@ -37618,6 +39086,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "god-mode";
+        ename = "god-mode";
         version = "20180117.334";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -37642,6 +39111,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "godoctor";
+        ename = "godoctor";
         version = "20180710.1452";
         src = fetchFromGitHub {
           owner = "microamp";
@@ -37667,6 +39137,7 @@
                              , sws-mode }:
       melpaBuild {
         pname = "gold-mode";
+        ename = "gold-mode";
         version = "20140606.1906";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -37691,6 +39162,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "golden-ratio";
+        ename = "golden-ratio";
         version = "20150819.420";
         src = fetchFromGitHub {
           owner = "roman";
@@ -37715,6 +39187,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "golden-ratio-scroll-screen";
+        ename = "golden-ratio-scroll-screen";
         version = "20170223.1829";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -37741,6 +39214,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "goldendict";
+        ename = "goldendict";
         version = "20180121.120";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -37765,6 +39239,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "golint";
+        ename = "golint";
         version = "20180221.1215";
         src = fetchFromGitHub {
           owner = "golang";
@@ -37789,6 +39264,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "gom-mode";
+        ename = "gom-mode";
         version = "20131007.1953";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -37813,6 +39289,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "google";
+        ename = "google";
         version = "20140416.1048";
         src = fetchFromGitHub {
           owner = "hober";
@@ -37837,6 +39314,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "google-c-style";
+        ename = "google-c-style";
         version = "20180130.936";
         src = fetchFromGitHub {
           owner = "google";
@@ -37863,6 +39341,7 @@
                                    , oauth2 }:
       melpaBuild {
         pname = "google-contacts";
+        ename = "google-contacts";
         version = "20171027.1033";
         src = fetchFromGitHub {
           owner = "jd";
@@ -37888,6 +39367,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "google-maps";
+        ename = "google-maps";
         version = "20171002.734";
         src = fetchFromGitHub {
           owner = "jd";
@@ -37913,6 +39393,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "google-this";
+        ename = "google-this";
         version = "20170810.515";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -37937,6 +39418,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "google-translate";
+        ename = "google-translate";
         version = "20170713.119";
         src = fetchFromGitHub {
           owner = "atykhonov";
@@ -37962,6 +39444,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "goose-theme";
+        ename = "goose-theme";
         version = "20160828.545";
         src = fetchFromGitHub {
           owner = "tokenrove";
@@ -37987,6 +39470,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gore-mode";
+        ename = "gore-mode";
         version = "20151123.1127";
         src = fetchFromGitHub {
           owner = "sergey-pashaev";
@@ -38015,6 +39499,7 @@
                                , s }:
       melpaBuild {
         pname = "gorepl-mode";
+        ename = "gorepl-mode";
         version = "20170905.245";
         src = fetchFromGitHub {
           owner = "manute";
@@ -38043,6 +39528,7 @@
                           , s }:
       melpaBuild {
         pname = "gotest";
+        ename = "gotest";
         version = "20180617.633";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -38067,6 +39553,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gotham-theme";
+        ename = "gotham-theme";
         version = "20171013.1216";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -38091,6 +39578,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "goto-chg";
+        ename = "goto-chg";
         version = "20180105.1033";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -38116,6 +39604,7 @@
                             , s }:
       melpaBuild {
         pname = "goto-gem";
+        ename = "goto-gem";
         version = "20140729.1145";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -38140,6 +39629,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "goto-last-change";
+        ename = "goto-last-change";
         version = "20150109.1023";
         src = fetchFromGitHub {
           owner = "camdez";
@@ -38169,6 +39659,7 @@
                         , s }:
       melpaBuild {
         pname = "govc";
+        ename = "govc";
         version = "20180524.1323";
         src = fetchFromGitHub {
           owner = "vmware";
@@ -38193,6 +39684,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "govet";
+        ename = "govet";
         version = "20170808.1024";
         src = fetchFromGitHub {
           owner = "meshelton";
@@ -38218,6 +39710,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gpastel";
+        ename = "gpastel";
         version = "20180419.2350";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -38243,6 +39736,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "grab-mac-link";
+        ename = "grab-mac-link";
         version = "20180328.745";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -38269,6 +39763,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "grab-x-link";
+        ename = "grab-x-link";
         version = "20180205.346";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -38294,6 +39789,7 @@
                                , s }:
       melpaBuild {
         pname = "gradle-mode";
+        ename = "gradle-mode";
         version = "20150313.1205";
         src = fetchFromGitHub {
           owner = "jacobono";
@@ -38319,6 +39815,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "grails";
+        ename = "grails";
         version = "20160416.2336";
         src = fetchFromGitHub {
           owner = "lifeisfoo";
@@ -38343,6 +39840,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "grails-mode";
+        ename = "grails-mode";
         version = "20160504.211";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
@@ -38370,6 +39868,7 @@
                                           , projectile }:
       melpaBuild {
         pname = "grails-projectile-mode";
+        ename = "grails-projectile-mode";
         version = "20160327.624";
         src = fetchFromGitHub {
           owner = "yveszoundi";
@@ -38394,6 +39893,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "grandshell-theme";
+        ename = "grandshell-theme";
         version = "20180605.2217";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/grandshell-theme.git";
@@ -38428,6 +39928,7 @@
                             , web-mode }:
       melpaBuild {
         pname = "graphene";
+        ename = "graphene";
         version = "20180529.412";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -38464,6 +39965,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "graphene-meta-theme";
+        ename = "graphene-meta-theme";
         version = "20161204.807";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -38489,6 +39991,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "graphql-mode";
+        ename = "graphql-mode";
         version = "20180303.1558";
         src = fetchFromGitHub {
           owner = "davazp";
@@ -38513,6 +40016,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "graphviz-dot-mode";
+        ename = "graphviz-dot-mode";
         version = "20171103.127";
         src = fetchFromGitHub {
           owner = "ppareit";
@@ -38537,6 +40041,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "grapnel";
+        ename = "grapnel";
         version = "20131001.834";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -38563,6 +40068,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "grass-mode";
+        ename = "grass-mode";
         version = "20170503.800";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
@@ -38586,6 +40092,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "grayscale-theme";
+        ename = "grayscale-theme";
         version = "20171005.102";
         src = fetchFromGitHub {
           owner = "belak";
@@ -38610,6 +40117,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "green-is-the-new-black-theme";
+        ename = "green-is-the-new-black-theme";
         version = "20180322.1903";
         src = fetchFromGitHub {
           owner = "fredcamps";
@@ -38634,6 +40142,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "green-phosphor-theme";
+        ename = "green-phosphor-theme";
         version = "20150515.747";
         src = fetchFromGitHub {
           owner = "aalpern";
@@ -38658,6 +40167,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "green-screen-theme";
+        ename = "green-screen-theme";
         version = "20171130.234";
         src = fetchFromGitHub {
           owner = "rbanffy";
@@ -38682,6 +40192,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "gregorio-mode";
+        ename = "gregorio-mode";
         version = "20170705.751";
         src = fetchFromGitHub {
           owner = "jsrjenkins";
@@ -38706,6 +40217,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "grep-a-lot";
+        ename = "grep-a-lot";
         version = "20131006.647";
         src = fetchFromGitHub {
           owner = "ZungBang";
@@ -38733,6 +40245,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "grep-context";
+        ename = "grep-context";
         version = "20180415.435";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -38758,6 +40271,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "greymatters-theme";
+        ename = "greymatters-theme";
         version = "20150621.423";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -38782,6 +40296,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "grin";
+        ename = "grin";
         version = "20110805.2358";
         src = fetchhg {
           url = "https://bitbucket.com/dariusp686/emacs-grin";
@@ -38807,6 +40322,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "grizzl";
+        ename = "grizzl";
         version = "20160818.37";
         src = fetchFromGitHub {
           owner = "grizzl";
@@ -38834,6 +40350,7 @@
                                   , s }:
       melpaBuild {
         pname = "groovy-imports";
+        ename = "groovy-imports";
         version = "20161003.151";
         src = fetchFromGitHub {
           owner = "mbezjak";
@@ -38861,6 +40378,7 @@
                                , s }:
       melpaBuild {
         pname = "groovy-mode";
+        ename = "groovy-mode";
         version = "20180601.738";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
@@ -38885,6 +40403,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gruber-darker-theme";
+        ename = "gruber-darker-theme";
         version = "20180529.12";
         src = fetchFromGitHub {
           owner = "rexim";
@@ -38912,6 +40431,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "grunt";
+        ename = "grunt";
         version = "20160316.828";
         src = fetchFromGitHub {
           owner = "gempesaw";
@@ -38937,6 +40457,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "gruvbox-theme";
+        ename = "gruvbox-theme";
         version = "20180623.2009";
         src = fetchFromGitHub {
           owner = "Greduan";
@@ -38961,6 +40482,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gs-mode";
+        ename = "gs-mode";
         version = "20151202.206";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -38985,6 +40507,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "gscholar-bibtex";
+        ename = "gscholar-bibtex";
         version = "20170913.1457";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -39009,6 +40532,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "gtk-pomodoro-indicator";
+        ename = "gtk-pomodoro-indicator";
         version = "20171230.840";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -39035,6 +40559,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "guess-language";
+        ename = "guess-language";
         version = "20170620.308";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -39062,6 +40587,7 @@
                              , s }:
       melpaBuild {
         pname = "guide-key";
+        ename = "guide-key";
         version = "20150107.2235";
         src = fetchFromGitHub {
           owner = "kai2nenobu";
@@ -39088,6 +40614,7 @@
                                  , pos-tip }:
       melpaBuild {
         pname = "guide-key-tip";
+        ename = "guide-key-tip";
         version = "20161011.123";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -39118,6 +40645,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "guix";
+        ename = "guix";
         version = "20180705.315";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -39142,6 +40670,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "gulp-task-runner";
+        ename = "gulp-task-runner";
         version = "20170718.1341";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -39166,6 +40695,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "guru-mode";
+        ename = "guru-mode";
         version = "20170730.31";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -39190,6 +40720,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gvpr-mode";
+        ename = "gvpr-mode";
         version = "20131208.918";
         src = fetchFromGitHub {
           owner = "rodw";
@@ -39215,6 +40746,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "gxref";
+        ename = "gxref";
         version = "20170411.1053";
         src = fetchFromGitHub {
           owner = "dedi";
@@ -39240,6 +40772,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "habamax-theme";
+        ename = "habamax-theme";
         version = "20180702.958";
         src = fetchFromGitHub {
           owner = "habamax";
@@ -39266,6 +40799,7 @@
                             , org }:
       melpaBuild {
         pname = "habitica";
+        ename = "habitica";
         version = "20171022.1922";
         src = fetchFromGitHub {
           owner = "abrochard";
@@ -39291,6 +40825,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hack-time-mode";
+        ename = "hack-time-mode";
         version = "20170527.910";
         src = fetchFromGitLab {
           owner = "marcowahl";
@@ -39316,6 +40851,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "hacker-typer";
+        ename = "hacker-typer";
         version = "20170206.720";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
@@ -39341,6 +40877,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "hackernews";
+        ename = "hackernews";
         version = "20180220.419";
         src = fetchFromGitHub {
           owner = "clarete";
@@ -39365,6 +40902,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "hal-mode";
+        ename = "hal-mode";
         version = "20160704.1046";
         src = fetchFromGitHub {
           owner = "strahlex";
@@ -39391,6 +40929,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ham-mode";
+        ename = "ham-mode";
         version = "20150811.606";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -39416,6 +40955,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hamburg-theme";
+        ename = "hamburg-theme";
         version = "20160122.2340";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -39441,6 +40981,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hamburger-menu";
+        ename = "hamburger-menu";
         version = "20160825.1331";
         src = fetchFromGitLab {
           owner = "iain";
@@ -39467,6 +41008,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "haml-mode";
+        ename = "haml-mode";
         version = "20170923.2153";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -39494,6 +41036,7 @@
                                , s }:
       melpaBuild {
         pname = "hamlet-mode";
+        ename = "hamlet-mode";
         version = "20131207.2324";
         src = fetchFromGitHub {
           owner = "lightquake";
@@ -39518,6 +41061,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "handlebars-mode";
+        ename = "handlebars-mode";
         version = "20150211.949";
         src = fetchFromGitHub {
           owner = "danielevans";
@@ -39542,6 +41086,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "handlebars-sgml-mode";
+        ename = "handlebars-sgml-mode";
         version = "20130623.1633";
         src = fetchFromGitHub {
           owner = "jacott";
@@ -39566,6 +41111,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "handoff";
+        ename = "handoff";
         version = "20150916.2300";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -39590,6 +41136,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hardcore-mode";
+        ename = "hardcore-mode";
         version = "20151113.2301";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -39615,6 +41162,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hardhat";
+        ename = "hardhat";
         version = "20160414.713";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -39642,6 +41190,7 @@
                            , swiper }:
       melpaBuild {
         pname = "harvest";
+        ename = "harvest";
         version = "20170822.1046";
         src = fetchFromGitHub {
           owner = "kostajh";
@@ -39666,6 +41215,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs";
+        ename = "haskell-emacs";
         version = "20160904.1326";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -39691,6 +41241,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs-base";
+        ename = "haskell-emacs-base";
         version = "20150714.859";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -39716,6 +41267,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs-text";
+        ename = "haskell-emacs-text";
         version = "20150713.716";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -39741,6 +41293,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "haskell-mode";
+        ename = "haskell-mode";
         version = "20180601.143";
         src = fetchFromGitHub {
           owner = "haskell";
@@ -39767,6 +41320,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "haskell-snippets";
+        ename = "haskell-snippets";
         version = "20160918.1722";
         src = fetchFromGitHub {
           owner = "haskell";
@@ -39791,6 +41345,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-tab-indent";
+        ename = "haskell-tab-indent";
         version = "20170701.258";
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
@@ -39816,6 +41371,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "hasky-extensions";
+        ename = "hasky-extensions";
         version = "20180107.2112";
         src = fetchFromGitHub {
           owner = "hasky-mode";
@@ -39843,6 +41399,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hasky-stack";
+        ename = "hasky-stack";
         version = "20180331.208";
         src = fetchFromGitHub {
           owner = "hasky-mode";
@@ -39868,6 +41425,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "haste";
+        ename = "haste";
         version = "20141030.1334";
         src = fetchFromGitHub {
           owner = "rlister";
@@ -39895,6 +41453,7 @@
                                 , s }:
       melpaBuild {
         pname = "haxe-imports";
+        ename = "haxe-imports";
         version = "20170330.1604";
         src = fetchFromGitHub {
           owner = "accidentalrebel";
@@ -39919,6 +41478,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "haxe-mode";
+        ename = "haxe-mode";
         version = "20131004.142";
         src = fetchhg {
           url = "https://bitbucket.com/jpsecher/haxe-mode";
@@ -39943,6 +41503,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "haxor-mode";
+        ename = "haxor-mode";
         version = "20160618.429";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -39969,6 +41530,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "hayoo";
+        ename = "hayoo";
         version = "20140831.521";
         src = fetchFromGitHub {
           owner = "benma";
@@ -39993,6 +41555,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "hc-zenburn-theme";
+        ename = "hc-zenburn-theme";
         version = "20150928.933";
         src = fetchFromGitHub {
           owner = "edran";
@@ -40018,6 +41581,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "hcl-mode";
+        ename = "hcl-mode";
         version = "20170107.27";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -40042,6 +41606,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "headlong";
+        ename = "headlong";
         version = "20150417.826";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -40067,6 +41632,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "heaven-and-hell";
+        ename = "heaven-and-hell";
         version = "20180421.221";
         src = fetchFromGitHub {
           owner = "valignatev";
@@ -40095,12 +41661,13 @@
                         , popup }:
       melpaBuild {
         pname = "helm";
-        version = "20180714.445";
+        ename = "helm";
+        version = "20180719.1206";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "75db7c3be86c8c35570bed19edfde2b029590cfd";
-          sha256 = "1gbryi4qq73l0jsg4pipl1ppwpbgrhizrd9y2wfxcz6cq8lk3rvr";
+          rev = "345842e1a36b8dfa23eb516e8a8cb64783505f6b";
+          sha256 = "0k8i2ay8mmqfxsfyg12mp2rg27h9xqbvvsfmd38xgc2ni4c1sd1f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -40121,6 +41688,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "helm-R";
+        ename = "helm-R";
         version = "20120819.1714";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -40147,6 +41715,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ack";
+        ename = "helm-ack";
         version = "20141030.526";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -40173,6 +41742,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-ad";
+        ename = "helm-ad";
         version = "20151209.215";
         src = fetchFromGitHub {
           owner = "tnoda";
@@ -40201,6 +41771,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-addressbook";
+        ename = "helm-addressbook";
         version = "20170903.28";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -40227,6 +41798,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-ag";
+        ename = "helm-ag";
         version = "20170209.745";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -40252,6 +41824,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-ag-r";
+        ename = "helm-ag-r";
         version = "20131123.731";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -40279,6 +41852,7 @@
                             , s }:
       melpaBuild {
         pname = "helm-aws";
+        ename = "helm-aws";
         version = "20180514.332";
         src = fetchFromGitHub {
           owner = "istib";
@@ -40306,6 +41880,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-backup";
+        ename = "helm-backup";
         version = "20171204.2357";
         src = fetchFromGitHub {
           owner = "antham";
@@ -40332,6 +41907,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-bbdb";
+        ename = "helm-bbdb";
         version = "20180505.808";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -40363,6 +41939,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-bibtex";
+        ename = "helm-bibtex";
         version = "20180612.619";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -40388,6 +41965,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-bibtexkey";
+        ename = "helm-bibtexkey";
         version = "20140214.704";
         src = fetchFromGitHub {
           owner = "kenbeese";
@@ -40414,6 +41992,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-bind-key";
+        ename = "helm-bind-key";
         version = "20141108.2115";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -40442,6 +42021,7 @@
                            , s }:
       melpaBuild {
         pname = "helm-bm";
+        ename = "helm-bm";
         version = "20160321.631";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -40467,6 +42047,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-books";
+        ename = "helm-books";
         version = "20170324.2331";
         src = fetchFromGitHub {
           owner = "grugrut";
@@ -40492,6 +42073,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-bundle-show";
+        ename = "helm-bundle-show";
         version = "20151221.430";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -40518,6 +42100,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-c-moccur";
+        ename = "helm-c-moccur";
         version = "20151230.124";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -40545,6 +42128,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "helm-c-yasnippet";
+        ename = "helm-c-yasnippet";
         version = "20170128.742";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -40572,6 +42156,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-charinfo";
+        ename = "helm-charinfo";
         version = "20170810.531";
         src = fetchFromGitHub {
           owner = "mandoku";
@@ -40599,6 +42184,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-chrome";
+        ename = "helm-chrome";
         version = "20160718.2220";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -40625,6 +42211,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-chronos";
+        ename = "helm-chronos";
         version = "20150528.1336";
         src = fetchFromGitHub {
           owner = "dxknight";
@@ -40652,6 +42239,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-cider";
+        ename = "helm-cider";
         version = "20180306.2058";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -40678,6 +42266,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-cider-history";
+        ename = "helm-cider-history";
         version = "20150719.1420";
         src = fetchFromGitHub {
           owner = "Kungi";
@@ -40706,6 +42295,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-circe";
+        ename = "helm-circe";
         version = "20160206.2252";
         src = fetchFromGitHub {
           owner = "lesharris";
@@ -40732,6 +42322,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-clojuredocs";
+        ename = "helm-clojuredocs";
         version = "20160405.23";
         src = fetchFromGitHub {
           owner = "mbuczko";
@@ -40756,6 +42347,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-cmd-t";
+        ename = "helm-cmd-t";
         version = "20170125.659";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -40784,6 +42376,7 @@
                                    , s }:
       melpaBuild {
         pname = "helm-codesearch";
+        ename = "helm-codesearch";
         version = "20180203.2033";
         src = fetchFromGitHub {
           owner = "youngker";
@@ -40812,6 +42405,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-commandlinefu";
+        ename = "helm-commandlinefu";
         version = "20150610.2245";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -40838,6 +42432,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-company";
+        ename = "helm-company";
         version = "20180213.1405";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
@@ -40864,6 +42459,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-core";
+        ename = "helm-core";
         version = "20180712.137";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -40892,6 +42488,7 @@
                                , xcscope }:
       melpaBuild {
         pname = "helm-cscope";
+        ename = "helm-cscope";
         version = "20170326.22";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -40918,6 +42515,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-css-scss";
+        ename = "helm-css-scss";
         version = "20140626.1725";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -40945,6 +42543,7 @@
                               , s }:
       melpaBuild {
         pname = "helm-ctest";
+        ename = "helm-ctest";
         version = "20180125.2058";
         src = fetchFromGitHub {
           owner = "danlamanna";
@@ -40971,6 +42570,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-dash";
+        ename = "helm-dash";
         version = "20180503.218";
         src = fetchFromGitHub {
           owner = "areina";
@@ -40996,6 +42596,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-descbinds";
+        ename = "helm-descbinds";
         version = "20180429.756";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41023,6 +42624,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "helm-describe-modes";
+        ename = "helm-describe-modes";
         version = "20160211.2118";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41048,6 +42650,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-dictionary";
+        ename = "helm-dictionary";
         version = "20160817.1333";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41074,6 +42677,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-directory";
+        ename = "helm-directory";
         version = "20170705.2102";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -41100,6 +42704,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-dired-history";
+        ename = "helm-dired-history";
         version = "20170524.346";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -41125,6 +42730,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "helm-dired-recent-dirs";
+        ename = "helm-dired-recent-dirs";
         version = "20131228.614";
         src = fetchFromGitHub {
           owner = "akisute3";
@@ -41153,6 +42759,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-dirset";
+        ename = "helm-dirset";
         version = "20151208.1612";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -41181,6 +42788,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-elscreen";
+        ename = "helm-elscreen";
         version = "20170709.214";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41207,6 +42815,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-emmet";
+        ename = "helm-emmet";
         version = "20160713.531";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -41235,6 +42844,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-emms";
+        ename = "helm-emms";
         version = "20180405.2228";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41260,6 +42870,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-etags-plus";
+        ename = "helm-etags-plus";
         version = "20170113.614";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -41287,6 +42898,7 @@
                             , seq }:
       melpaBuild {
         pname = "helm-eww";
+        ename = "helm-eww";
         version = "20180511.618";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41313,6 +42925,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ext";
+        ename = "helm-ext";
         version = "20180525.2050";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -41340,6 +42953,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-exwm";
+        ename = "helm-exwm";
         version = "20180703.919";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41366,6 +42980,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-filesets";
+        ename = "helm-filesets";
         version = "20140929.1135";
         src = fetchFromGitHub {
           owner = "gcla";
@@ -41393,6 +43008,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-firefox";
+        ename = "helm-firefox";
         version = "20161202.517";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -41420,6 +43036,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-flx";
+        ename = "helm-flx";
         version = "20180102.2116";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -41447,6 +43064,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-flycheck";
+        ename = "helm-flycheck";
         version = "20160710.129";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -41472,6 +43090,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-flymake";
+        ename = "helm-flymake";
         version = "20160609.1702";
         src = fetchFromGitHub {
           owner = "tam17aki";
@@ -41497,6 +43116,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-flyspell";
+        ename = "helm-flyspell";
         version = "20170210.1101";
         src = fetchFromGitHub {
           owner = "pronobis";
@@ -41522,6 +43142,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-frame";
+        ename = "helm-frame";
         version = "20170515.1250";
         src = fetchFromGitLab {
           owner = "chee";
@@ -41548,6 +43169,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-fuzzier";
+        ename = "helm-fuzzier";
         version = "20160605.1445";
         src = fetchFromGitHub {
           owner = "EphramPerdition";
@@ -41574,6 +43196,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-fuzzy-find";
+        ename = "helm-fuzzy-find";
         version = "20171105.2000";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -41602,6 +43225,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ghc";
+        ename = "helm-ghc";
         version = "20141105.659";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -41627,6 +43251,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ghq";
+        ename = "helm-ghq";
         version = "20161015.117";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -41653,6 +43278,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ghs";
+        ename = "helm-ghs";
         version = "20170714.2241";
         src = fetchFromGitHub {
           owner = "iory";
@@ -41677,6 +43303,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-git";
+        ename = "helm-git";
         version = "20120630.1403";
         src = fetchFromGitHub {
           owner = "maio";
@@ -41702,6 +43329,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-git-files";
+        ename = "helm-git-files";
         version = "20141212.517";
         src = fetchFromGitHub {
           owner = "kenbeese";
@@ -41727,6 +43355,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-git-grep";
+        ename = "helm-git-grep";
         version = "20170614.711";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -41753,12 +43382,13 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-github-stars";
-        version = "20180713.1743";
+        ename = "helm-github-stars";
+        version = "20180717.1811";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "c0ca595e23246165adc12bd85ba7b09760290bc3";
-          sha256 = "0z3nangwhxxhlzd7la9k8gqqxr321iy9z5w6hlvb3f3qgxc84y17";
+          rev = "809cf88e2984b121348b1046e1d3890f1fd580b4";
+          sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
@@ -41781,6 +43411,7 @@
                                   , request }:
       melpaBuild {
         pname = "helm-gitignore";
+        ename = "helm-gitignore";
         version = "20170210.1608";
         src = fetchFromGitHub {
           owner = "jupl";
@@ -41809,6 +43440,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-gitlab";
+        ename = "helm-gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -41837,6 +43469,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-go-package";
+        ename = "helm-go-package";
         version = "20161102.1853";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -41862,6 +43495,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-google";
+        ename = "helm-google";
         version = "20180605.2220";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/helm-google.git";
@@ -41887,6 +43521,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-grepint";
+        ename = "helm-grepint";
         version = "20161001.713";
         src = fetchFromGitHub {
           owner = "kopoli";
@@ -41912,6 +43547,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "helm-growthforecast";
+        ename = "helm-growthforecast";
         version = "20140119.1944";
         src = fetchFromGitHub {
           owner = "daichirata";
@@ -41938,6 +43574,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-gtags";
+        ename = "helm-gtags";
         version = "20170115.2129";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -41963,6 +43600,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "helm-hatena-bookmark";
+        ename = "helm-hatena-bookmark";
         version = "20170821.646";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -41990,6 +43628,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-hayoo";
+        ename = "helm-hayoo";
         version = "20151013.2351";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -42015,6 +43654,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-helm-commands";
+        ename = "helm-helm-commands";
         version = "20130902.1048";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -42041,6 +43681,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-hoogle";
+        ename = "helm-hoogle";
         version = "20161026.2234";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -42067,6 +43708,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-hunks";
+        ename = "helm-hunks";
         version = "20171217.1133";
         src = fetchFromGitHub {
           owner = "torgeir";
@@ -42093,6 +43735,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-idris";
+        ename = "helm-idris";
         version = "20141202.957";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -42119,6 +43762,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-img";
+        ename = "helm-img";
         version = "20151224.1521";
         src = fetchFromGitHub {
           owner = "l3msh0";
@@ -42144,6 +43788,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-img-tiqav";
+        ename = "helm-img-tiqav";
         version = "20151224.1522";
         src = fetchFromGitHub {
           owner = "l3msh0";
@@ -42169,6 +43814,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-ispell";
+        ename = "helm-ispell";
         version = "20151231.53";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -42194,6 +43840,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-itunes";
+        ename = "helm-itunes";
         version = "20151012.2348";
         src = fetchFromGitHub {
           owner = "anschwa";
@@ -42219,6 +43866,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-j-cheatsheet";
+        ename = "helm-j-cheatsheet";
         version = "20170217.29";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -42246,6 +43894,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-js-codemod";
+        ename = "helm-js-codemod";
         version = "20171106.244";
         src = fetchFromGitHub {
           owner = "torgeir";
@@ -42273,6 +43922,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-jstack";
+        ename = "helm-jstack";
         version = "20150602.2122";
         src = fetchFromGitHub {
           owner = "raghavgautam";
@@ -42300,6 +43950,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-kythe";
+        ename = "helm-kythe";
         version = "20170709.26";
         src = fetchFromGitHub {
           owner = "MaskRay";
@@ -42327,12 +43978,13 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-lastpass";
-        version = "20180430.1012";
+        ename = "helm-lastpass";
+        version = "20180722.106";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-lastpass";
-          rev = "522e14893f26c5342543bde8bb76f2e9ce1ee691";
-          sha256 = "1kdrs927myrp6h6f0xskd1ipli12y2s5k6nk8w2hnq82a6a5b484";
+          rev = "82e1ffb6ae77d9d9e29c398eb013cd20ce963f77";
+          sha256 = "0pri9zsjg0zii7dpsr56dy5204q0mld5wi22iay3kqpiyxghhssv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
@@ -42355,6 +44007,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-lean";
+        ename = "helm-lean";
         version = "20171102.754";
         src = fetchFromGitHub {
           owner = "leanprover";
@@ -42382,6 +44035,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-lib-babel";
+        ename = "helm-lib-babel";
         version = "20180510.624";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -42408,6 +44062,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-lines";
+        ename = "helm-lines";
         version = "20180601.1333";
         src = fetchFromGitHub {
           owner = "torgeir";
@@ -42434,6 +44089,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-lobsters";
+        ename = "helm-lobsters";
         version = "20150213.746";
         src = fetchFromGitHub {
           owner = "julienXX";
@@ -42459,6 +44115,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-ls-git";
+        ename = "helm-ls-git";
         version = "20180711.223";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -42484,6 +44141,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-ls-hg";
+        ename = "helm-ls-hg";
         version = "20150908.2243";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -42511,6 +44169,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-ls-svn";
+        ename = "helm-ls-svn";
         version = "20150717.39";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -42537,6 +44196,7 @@
                              , projectile }:
       melpaBuild {
         pname = "helm-make";
+        ename = "helm-make";
         version = "20180602.653";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -42565,6 +44225,7 @@
                                , migemo }:
       melpaBuild {
         pname = "helm-migemo";
+        ename = "helm-migemo";
         version = "20151009.2056";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -42590,6 +44251,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-mode-manager";
+        ename = "helm-mode-manager";
         version = "20151124.138";
         src = fetchFromGitHub {
           owner = "istib";
@@ -42618,6 +44280,7 @@
                            , multi-term }:
       melpaBuild {
         pname = "helm-mt";
+        ename = "helm-mt";
         version = "20160917.2152";
         src = fetchFromGitHub {
           owner = "dfdeshom";
@@ -42643,6 +44306,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-mu";
+        ename = "helm-mu";
         version = "20180513.221";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -42671,6 +44335,7 @@
                              , s }:
       melpaBuild {
         pname = "helm-navi";
+        ename = "helm-navi";
         version = "20170402.752";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -42697,6 +44362,7 @@
                                       , nixos-options }:
       melpaBuild {
         pname = "helm-nixos-options";
+        ename = "helm-nixos-options";
         version = "20151013.1609";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -42723,6 +44389,7 @@
                                 , notmuch }:
       melpaBuild {
         pname = "helm-notmuch";
+        ename = "helm-notmuch";
         version = "20180521.407";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -42750,6 +44417,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-open-github";
+        ename = "helm-open-github";
         version = "20170219.1759";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -42779,6 +44447,7 @@
                                   , s }:
       melpaBuild {
         pname = "helm-org-rifle";
+        ename = "helm-org-rifle";
         version = "20180712.1545";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -42804,6 +44473,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-orgcard";
+        ename = "helm-orgcard";
         version = "20151001.824";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -42831,6 +44501,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-pages";
+        ename = "helm-pages";
         version = "20161120.1826";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -42859,6 +44530,7 @@
                              , password-store }:
       melpaBuild {
         pname = "helm-pass";
+        ename = "helm-pass";
         version = "20180607.1648";
         src = fetchFromGitLab {
           owner = "jabranham";
@@ -42886,6 +44558,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-perldoc";
+        ename = "helm-perldoc";
         version = "20160917.2256";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -42912,6 +44585,7 @@
                                  , perspeen }:
       melpaBuild {
         pname = "helm-perspeen";
+        ename = "helm-perspeen";
         version = "20170228.545";
         src = fetchFromGitHub {
           owner = "jimo1001";
@@ -42938,6 +44612,7 @@
                                 , phpunit }:
       melpaBuild {
         pname = "helm-phpunit";
+        ename = "helm-phpunit";
         version = "20160513.153";
         src = fetchFromGitHub {
           owner = "eric-hansen";
@@ -42965,6 +44640,7 @@
                                  , posframe }:
       melpaBuild {
         pname = "helm-posframe";
+        ename = "helm-posframe";
         version = "20180610.1048";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -42990,6 +44666,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-proc";
+        ename = "helm-proc";
         version = "20161005.2005";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -43016,6 +44693,7 @@
                                         , project-persist }:
       melpaBuild {
         pname = "helm-project-persist";
+        ename = "helm-project-persist";
         version = "20151210.743";
         src = fetchFromGitHub {
           owner = "Sliim";
@@ -43043,12 +44721,13 @@
                                    , projectile }:
       melpaBuild {
         pname = "helm-projectile";
-        version = "20180620.935";
+        ename = "helm-projectile";
+        version = "20180722.1426";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "8aae5d87fa9937777cfa67b7012f5ca33c81893f";
-          sha256 = "08xhmz8d5lksl7anlmqgpcl8ibqrwid8ask271mdbxix7d1011iq";
+          rev = "74349fc9132502af2b2e6ca9a51185ae4c9391b4";
+          sha256 = "0b24gypvbr1k7pks4fvniwa6smi4vflr5lgd3b82y2ah0b8x758m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -43069,6 +44748,7 @@
                                  , prosjekt }:
       melpaBuild {
         pname = "helm-prosjekt";
+        ename = "helm-prosjekt";
         version = "20140128.2317";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -43094,6 +44774,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-pt";
+        ename = "helm-pt";
         version = "20160214.1542";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -43121,6 +44802,7 @@
                                 , window-purpose }:
       melpaBuild {
         pname = "helm-purpose";
+        ename = "helm-purpose";
         version = "20170114.836";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -43147,6 +44829,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-pydoc";
+        ename = "helm-pydoc";
         version = "20160917.2242";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43172,6 +44855,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-qiita";
+        ename = "helm-qiita";
         version = "20180301.635";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -43200,6 +44884,7 @@
                              , s }:
       melpaBuild {
         pname = "helm-rage";
+        ename = "helm-rage";
         version = "20180118.732";
         src = fetchFromGitHub {
           owner = "bomgar";
@@ -43226,6 +44911,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-rails";
+        ename = "helm-rails";
         version = "20130424.819";
         src = fetchFromGitHub {
           owner = "asok";
@@ -43252,6 +44938,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-rb";
+        ename = "helm-rb";
         version = "20131123.839";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -43278,6 +44965,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-rdefs";
+        ename = "helm-rdefs";
         version = "20161129.2136";
         src = fetchFromGitHub {
           owner = "saidie";
@@ -43303,6 +44991,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-recoll";
+        ename = "helm-recoll";
         version = "20160731.221";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -43331,6 +45020,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-rg";
+        ename = "helm-rg";
         version = "20180629.220";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -43357,6 +45047,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-rhythmbox";
+        ename = "helm-rhythmbox";
         version = "20160524.458";
         src = fetchFromGitHub {
           owner = "mrBliss";
@@ -43382,6 +45073,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-robe";
+        ename = "helm-robe";
         version = "20151208.1955";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43409,6 +45101,7 @@
                             , xterm-color }:
       melpaBuild {
         pname = "helm-ros";
+        ename = "helm-ros";
         version = "20160812.1052";
         src = fetchFromGitHub {
           owner = "davidlandry93";
@@ -43435,6 +45128,7 @@
                               , rtags }:
       melpaBuild {
         pname = "helm-rtags";
+        ename = "helm-rtags";
         version = "20170812.2111";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -43460,6 +45154,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "helm-rubygems-local";
+        ename = "helm-rubygems-local";
         version = "20130711.1811";
         src = fetchFromGitHub {
           owner = "hadashiA";
@@ -43487,6 +45182,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-rubygems-org";
+        ename = "helm-rubygems-org";
         version = "20140826.456";
         src = fetchFromGitHub {
           owner = "neomantic";
@@ -43513,6 +45209,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-safari";
+        ename = "helm-safari";
         version = "20160403.2024";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -43540,6 +45237,7 @@
                              , sage-shell-mode }:
       melpaBuild {
         pname = "helm-sage";
+        ename = "helm-sage";
         version = "20160514.45";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -43567,6 +45265,7 @@
                                  , selected }:
       melpaBuild {
         pname = "helm-selected";
+        ename = "helm-selected";
         version = "20171222.1810";
         src = fetchFromGitHub {
           owner = "takaxp";
@@ -43592,6 +45291,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-sheet";
+        ename = "helm-sheet";
         version = "20130630.539";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -43619,6 +45319,7 @@
                              , smex }:
       melpaBuild {
         pname = "helm-smex";
+        ename = "helm-smex";
         version = "20171004.1308";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -43645,6 +45346,7 @@
                                , spaces }:
       melpaBuild {
         pname = "helm-spaces";
+        ename = "helm-spaces";
         version = "20161001.709";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -43671,6 +45373,7 @@
                                 , multi }:
       melpaBuild {
         pname = "helm-spotify";
+        ename = "helm-spotify";
         version = "20160905.1447";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -43698,6 +45401,7 @@
                                      , multi }:
       melpaBuild {
         pname = "helm-spotify-plus";
+        ename = "helm-spotify-plus";
         version = "20180107.338";
         src = fetchFromGitHub {
           owner = "wandersoncferreira";
@@ -43723,6 +45427,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-sql-connect";
+        ename = "helm-sql-connect";
         version = "20170319.551";
         src = fetchFromGitHub {
           owner = "eric-hansen";
@@ -43749,6 +45454,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-swoop";
+        ename = "helm-swoop";
         version = "20180215.354";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -43776,6 +45482,7 @@
                                         , seq }:
       melpaBuild {
         pname = "helm-system-packages";
+        ename = "helm-system-packages";
         version = "20180628.1131";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -43803,6 +45510,7 @@
                                 , with-editor }:
       melpaBuild {
         pname = "helm-systemd";
+        ename = "helm-systemd";
         version = "20180130.2034";
         src = fetchFromGitHub {
           owner = "lompik";
@@ -43829,6 +45537,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-tail";
+        ename = "helm-tail";
         version = "20180624.203";
         src = fetchFromGitHub {
           owner = "akirak";
@@ -43855,6 +45564,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-themes";
+        ename = "helm-themes";
         version = "20160917.2245";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43881,6 +45591,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-tramp";
+        ename = "helm-tramp";
         version = "20180610.717";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -43907,6 +45618,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-unicode";
+        ename = "helm-unicode";
         version = "20180608.707";
         src = fetchFromGitHub {
           owner = "bomgar";
@@ -43934,6 +45646,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-w32-launcher";
+        ename = "helm-w32-launcher";
         version = "20141223.1214";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -43962,6 +45675,7 @@
                             , w3m }:
       melpaBuild {
         pname = "helm-w3m";
+        ename = "helm-w3m";
         version = "20171102.216";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -43989,6 +45703,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-wordnet";
+        ename = "helm-wordnet";
         version = "20160128.707";
         src = fetchFromGitHub {
           owner = "raghavgautam";
@@ -44015,6 +45730,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-xcdoc";
+        ename = "helm-xcdoc";
         version = "20160116.218";
         src = fetchFromGitHub {
           owner = "fujimisakari";
@@ -44041,6 +45757,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-xref";
+        ename = "helm-xref";
         version = "20180528.816";
         src = fetchFromGitHub {
           owner = "brotzeit";
@@ -44068,6 +45785,7 @@
                                 , request }:
       melpaBuild {
         pname = "helm-youtube";
+        ename = "helm-youtube";
         version = "20161113.1848";
         src = fetchFromGitHub {
           owner = "maximus12793";
@@ -44093,6 +45811,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "helm-z";
+        ename = "helm-z";
         version = "20171203.1925";
         src = fetchFromGitHub {
           owner = "yynozk";
@@ -44120,6 +45839,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-zhihu-daily";
+        ename = "helm-zhihu-daily";
         version = "20160625.445";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -44151,12 +45871,13 @@
                            , shut-up }:
       melpaBuild {
         pname = "helpful";
-        version = "20180708.1356";
+        ename = "helpful";
+        version = "20180722.1557";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "07fd87cffbcc243b77c1598477167ce702250c48";
-          sha256 = "18dmpgr2vlpa3ilj1xqdxmq5jls0i8swmgprfrh94vl11b6k7rvz";
+          rev = "89668dd787248c7f0d35d4ab26f4a61f2efefdcb";
+          sha256 = "0fwgvpp6bchvr0fr1s1rb56dywbgw8345v8i3c9sp2xa3ahqmvri";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -44176,6 +45897,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "hemera-theme";
+        ename = "hemera-theme";
         version = "20170910.603";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
@@ -44200,6 +45922,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "hemisu-theme";
+        ename = "hemisu-theme";
         version = "20130508.1144";
         src = fetchFromGitHub {
           owner = "andrzejsliwa";
@@ -44224,6 +45947,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "heroku";
+        ename = "heroku";
         version = "20120629.1113";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -44248,6 +45972,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "heroku-theme";
+        ename = "heroku-theme";
         version = "20150522.1919";
         src = fetchFromGitHub {
           owner = "jonathanchu";
@@ -44273,6 +45998,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hexo";
+        ename = "hexo";
         version = "20180223.1944";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -44297,6 +46023,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hfst-mode";
+        ename = "hfst-mode";
         version = "20160708.502";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -44321,6 +46048,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hgignore-mode";
+        ename = "hgignore-mode";
         version = "20160430.1707";
         src = fetchFromGitHub {
           owner = "omajid";
@@ -44345,6 +46073,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hgrc-mode";
+        ename = "hgrc-mode";
         version = "20150409.1343";
         src = fetchFromGitHub {
           owner = "omajid";
@@ -44369,6 +46098,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "hi2";
+        ename = "hi2";
         version = "20141005.1231";
         src = fetchFromGitHub {
           owner = "nilcons";
@@ -44393,6 +46123,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "hide-lines";
+        ename = "hide-lines";
         version = "20151127.1040";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -44418,6 +46149,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hide-mode-line";
+        ename = "hide-mode-line";
         version = "20180302.1110";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -44442,6 +46174,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "hideshow-org";
+        ename = "hideshow-org";
         version = "20120223.1450";
         src = fetchFromGitHub {
           owner = "shanecelis";
@@ -44467,6 +46200,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hierarchy";
+        ename = "hierarchy";
         version = "20171221.351";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -44491,6 +46225,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "highlight";
+        ename = "highlight";
         version = "20180604.2335";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/highlight.el.git";
@@ -44515,6 +46250,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-blocks";
+        ename = "highlight-blocks";
         version = "20151201.815";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -44539,6 +46275,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "highlight-context-line";
+        ename = "highlight-context-line";
         version = "20170319.1442";
         src = fetchFromGitHub {
           owner = "ska2342";
@@ -44564,6 +46301,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "highlight-defined";
+        ename = "highlight-defined";
         version = "20141225.730";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -44588,6 +46326,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "highlight-escape-sequences";
+        ename = "highlight-escape-sequences";
         version = "20171117.437";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -44613,6 +46352,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "highlight-function-calls";
+        ename = "highlight-function-calls";
         version = "20170907.2200";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -44638,6 +46378,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "highlight-indent-guides";
+        ename = "highlight-indent-guides";
         version = "20180529.1039";
         src = fetchFromGitHub {
           owner = "DarthFennec";
@@ -44662,6 +46403,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "highlight-indentation";
+        ename = "highlight-indentation";
         version = "20171218.137";
         src = fetchFromGitHub {
           owner = "antonj";
@@ -44687,6 +46429,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "highlight-leading-spaces";
+        ename = "highlight-leading-spaces";
         version = "20151216.422";
         src = fetchFromGitHub {
           owner = "mrBliss";
@@ -44713,6 +46456,7 @@
                                      , parent-mode }:
       melpaBuild {
         pname = "highlight-numbers";
+        ename = "highlight-numbers";
         version = "20170905.342";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -44737,6 +46481,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "highlight-operators";
+        ename = "highlight-operators";
         version = "20170213.1420";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/highlight-operators";
@@ -44760,6 +46505,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "highlight-parentheses";
+        ename = "highlight-parentheses";
         version = "20180704.402";
         src = fetchFromGitHub {
           owner = "tsdh";
@@ -44785,6 +46531,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-quoted";
+        ename = "highlight-quoted";
         version = "20140916.1122";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -44809,6 +46556,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "highlight-refontification";
+        ename = "highlight-refontification";
         version = "20170211.1224";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -44833,6 +46581,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-stages";
+        ename = "highlight-stages";
         version = "20161212.657";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -44857,6 +46606,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-symbol";
+        ename = "highlight-symbol";
         version = "20160102.1209";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -44881,6 +46631,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "highlight-thing";
+        ename = "highlight-thing";
         version = "20170919.704";
         src = fetchFromGitHub {
           owner = "fgeller";
@@ -44906,6 +46657,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "highlight-unique-symbol";
+        ename = "highlight-unique-symbol";
         version = "20130611.2242";
         src = fetchFromGitHub {
           owner = "hitode909";
@@ -44931,6 +46683,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "highlight2clipboard";
+        ename = "highlight2clipboard";
         version = "20151020.1140";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -44957,6 +46710,7 @@
                         , vimish-fold }:
       melpaBuild {
         pname = "himp";
+        ename = "himp";
         version = "20170814.1215";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -44982,6 +46736,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hindent";
+        ename = "hindent";
         version = "20180518.202";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -45006,6 +46761,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hippie-exp-ext";
+        ename = "hippie-exp-ext";
         version = "20160502.1626";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -45030,6 +46786,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "hippie-expand-slime";
+        ename = "hippie-expand-slime";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -45054,6 +46811,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "hippie-namespace";
+        ename = "hippie-namespace";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -45079,6 +46837,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "historian";
+        ename = "historian";
         version = "20180619.1223";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -45104,6 +46863,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "history";
+        ename = "history";
         version = "20160821.902";
         src = fetchFromGitHub {
           owner = "boyw165";
@@ -45128,6 +46888,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "historyf";
+        ename = "historyf";
         version = "20151123.1759";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -45153,6 +46914,7 @@
                         , sql ? null }:
       melpaBuild {
         pname = "hive";
+        ename = "hive";
         version = "20131217.712";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -45177,6 +46939,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "hiwin";
+        ename = "hiwin";
         version = "20150825.127";
         src = fetchFromGitHub {
           owner = "yoshida-mediba";
@@ -45202,6 +46965,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hl-anything";
+        ename = "hl-anything";
         version = "20160422.1008";
         src = fetchFromGitHub {
           owner = "hl-anything";
@@ -45228,6 +46992,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hl-indent";
+        ename = "hl-indent";
         version = "20170429.1404";
         src = fetchFromGitHub {
           owner = "ikirill";
@@ -45252,6 +47017,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hl-sentence";
+        ename = "hl-sentence";
         version = "20171018.819";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -45276,6 +47042,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hl-todo";
+        ename = "hl-todo";
         version = "20180709.2155";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -45304,6 +47071,7 @@
                                 , popup }:
       melpaBuild {
         pname = "hledger-mode";
+        ename = "hledger-mode";
         version = "20171201.1156";
         src = fetchFromGitHub {
           owner = "narendraj9";
@@ -45328,6 +47096,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hlint-refactor";
+        ename = "hlint-refactor";
         version = "20170817.2148";
         src = fetchFromGitHub {
           owner = "mpickering";
@@ -45353,6 +47122,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "hlinum";
+        ename = "hlinum";
         version = "20180421.2112";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -45379,6 +47149,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hmac";
+        ename = "hmac";
         version = "20180429.1310";
         src = fetchFromGitHub {
           owner = "grimnebulin";
@@ -45403,6 +47174,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "hoa-mode";
+        ename = "hoa-mode";
         version = "20151203.850";
         src = fetchgit {
           url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git";
@@ -45428,6 +47200,7 @@
                                , names }:
       melpaBuild {
         pname = "hoa-pp-mode";
+        ename = "hoa-pp-mode";
         version = "20151027.36";
         src = fetchFromGitHub {
           owner = "hoaproject";
@@ -45452,6 +47225,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "holiday-pascha-etc";
+        ename = "holiday-pascha-etc";
         version = "20160821.1758";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -45479,6 +47253,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "homebrew-mode";
+        ename = "homebrew-mode";
         version = "20160615.620";
         src = fetchFromGitHub {
           owner = "dunn";
@@ -45505,6 +47280,7 @@
                           , sudo-edit }:
       melpaBuild {
         pname = "honcho";
+        ename = "honcho";
         version = "20180706.1724";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -45531,6 +47307,7 @@
                            , s }:
       melpaBuild {
         pname = "hookify";
+        ename = "hookify";
         version = "20141216.1409";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -45556,6 +47333,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "horoscope";
+        ename = "horoscope";
         version = "20180408.2341";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -45582,6 +47360,7 @@
                          , request }:
       melpaBuild {
         pname = "hound";
+        ename = "hound";
         version = "20170627.1259";
         src = fetchFromGitHub {
           owner = "ryoung786";
@@ -45606,6 +47385,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "how-many-lines-in-project";
+        ename = "how-many-lines-in-project";
         version = "20140806.2142";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -45630,6 +47410,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "howdoi";
+        ename = "howdoi";
         version = "20150203.1643";
         src = fetchFromGitHub {
           owner = "atykhonov";
@@ -45655,6 +47436,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "howm";
+        ename = "howm";
         version = "20180225.205";
         src = fetchgit {
           url = "https://scm.osdn.net/gitroot/howm/howm.git";
@@ -45679,6 +47461,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ht";
+        ename = "ht";
         version = "20180129.1434";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -45704,6 +47487,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "html-check-frag";
+        ename = "html-check-frag";
         version = "20160130.2135";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
@@ -45728,6 +47512,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "html-script-src";
+        ename = "html-script-src";
         version = "20120403.1115";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -45755,6 +47540,7 @@
                                   , s }:
       melpaBuild {
         pname = "html-to-hiccup";
+        ename = "html-to-hiccup";
         version = "20161028.701";
         src = fetchFromGitHub {
           owner = "plexus";
@@ -45780,6 +47566,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "html-to-markdown";
+        ename = "html-to-markdown";
         version = "20151105.40";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -45805,6 +47592,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "html2org";
+        ename = "html2org";
         version = "20170417.2201";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -45829,6 +47617,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "htmlize";
+        ename = "htmlize";
         version = "20180412.1244";
         src = fetchFromGitHub {
           owner = "hniksic";
@@ -45856,6 +47645,7 @@
                         , request }:
       melpaBuild {
         pname = "http";
+        ename = "http";
         version = "20170906.1111";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -45880,6 +47670,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "http-post-simple";
+        ename = "http-post-simple";
         version = "20170715.240";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -45904,6 +47695,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "http-twiddle";
+        ename = "http-twiddle";
         version = "20160801.1211";
         src = fetchFromGitHub {
           owner = "hassy";
@@ -45928,6 +47720,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "httpcode";
+        ename = "httpcode";
         version = "20121001.2045";
         src = fetchFromGitHub {
           owner = "rspivak";
@@ -45955,6 +47748,7 @@
                             , s }:
       melpaBuild {
         pname = "httprepl";
+        ename = "httprepl";
         version = "20141101.1034";
         src = fetchFromGitHub {
           owner = "gregsexton";
@@ -45982,6 +47776,7 @@
                                  , s }:
       melpaBuild {
         pname = "hugsql-ghosts";
+        ename = "hugsql-ghosts";
         version = "20180425.429";
         src = fetchFromGitHub {
           owner = "rkaercher";
@@ -46006,6 +47801,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "hungarian-holidays";
+        ename = "hungarian-holidays";
         version = "20161020.438";
         src = fetchFromGitHub {
           owner = "gergelypolonkai";
@@ -46030,6 +47826,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hungry-delete";
+        ename = "hungry-delete";
         version = "20170411.1802";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -46058,6 +47855,7 @@
                            , s }:
       melpaBuild {
         pname = "hy-mode";
+        ename = "hy-mode";
         version = "20180702.1240";
         src = fetchFromGitHub {
           owner = "hylang";
@@ -46084,6 +47882,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hyai";
+        ename = "hyai";
         version = "20170301.647";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -46108,6 +47907,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "hydandata-light-theme";
+        ename = "hydandata-light-theme";
         version = "20160815.2118";
         src = fetchFromGitHub {
           owner = "hydandata";
@@ -46132,6 +47932,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hyde";
+        ename = "hyde";
         version = "20160507.2008";
         src = fetchFromGitHub {
           owner = "nibrahim";
@@ -46157,6 +47958,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "hydra";
+        ename = "hydra";
         version = "20180703.802";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -46181,6 +47983,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "i2b2-mode";
+        ename = "i2b2-mode";
         version = "20140709.1804";
         src = fetchFromGitHub {
           owner = "danlamanna";
@@ -46205,6 +48008,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "i3wm";
+        ename = "i3wm";
         version = "20170822.738";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/emacs-i3.git";
@@ -46229,6 +48033,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ialign";
+        ename = "ialign";
         version = "20180705.453";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -46253,6 +48058,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "iasm-mode";
+        ename = "iasm-mode";
         version = "20171023.722";
         src = fetchFromGitHub {
           owner = "RAttab";
@@ -46277,6 +48083,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-git";
+        ename = "ibuffer-git";
         version = "20110508.31";
         src = fetchFromGitHub {
           owner = "jrockway";
@@ -46302,6 +48109,7 @@
                                       , projectile }:
       melpaBuild {
         pname = "ibuffer-projectile";
+        ename = "ibuffer-projectile";
         version = "20180324.2025";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -46327,6 +48135,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-rcirc";
+        ename = "ibuffer-rcirc";
         version = "20150215.1318";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -46352,6 +48161,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-sidebar";
+        ename = "ibuffer-sidebar";
         version = "20180218.1731";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -46376,6 +48186,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-tramp";
+        ename = "ibuffer-tramp";
         version = "20151118.939";
         src = fetchFromGitHub {
           owner = "svend";
@@ -46401,6 +48212,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-vc";
+        ename = "ibuffer-vc";
         version = "20171106.2341";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -46425,6 +48237,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "id-manager";
+        ename = "id-manager";
         version = "20170320.546";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -46450,6 +48263,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "idea-darkula-theme";
+        ename = "idea-darkula-theme";
         version = "20160416.1603";
         src = fetchFromGitHub {
           owner = "fourier";
@@ -46474,6 +48288,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "identica-mode";
+        ename = "identica-mode";
         version = "20130204.1453";
         src = fetchFromGitHub {
           owner = "gabrielsaldana";
@@ -46498,6 +48313,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "idle-highlight-mode";
+        ename = "idle-highlight-mode";
         version = "20120920.948";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -46522,6 +48338,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "idle-require";
+        ename = "idle-require";
         version = "20090715.1503";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -46547,6 +48364,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ido-at-point";
+        ename = "ido-at-point";
         version = "20151021.57";
         src = fetchFromGitHub {
           owner = "katspaugh";
@@ -46573,6 +48391,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ido-clever-match";
+        ename = "ido-clever-match";
         version = "20151011.1026";
         src = fetchFromGitHub {
           owner = "Bogdanp";
@@ -46597,6 +48416,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "ido-complete-space-or-hyphen";
+        ename = "ido-complete-space-or-hyphen";
         version = "20130228.208";
         src = fetchFromGitHub {
           owner = "doitian";
@@ -46625,6 +48445,7 @@
                                             , s }:
       melpaBuild {
         pname = "ido-completing-read-plus";
+        ename = "ido-completing-read+";
         version = "20180627.1944";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -46650,6 +48471,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "ido-describe-bindings";
+        ename = "ido-describe-bindings";
         version = "20161023.402";
         src = fetchFromGitHub {
           owner = "danil";
@@ -46675,6 +48497,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ido-exit-target";
+        ename = "ido-exit-target";
         version = "20170717.1151";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -46702,6 +48525,7 @@
                                         , migemo }:
       melpaBuild {
         pname = "ido-flex-with-migemo";
+        ename = "ido-flex-with-migemo";
         version = "20180323.456";
         src = fetchFromGitHub {
           owner = "ROCKTAKEY";
@@ -46727,6 +48551,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ido-gnus";
+        ename = "ido-gnus";
         version = "20140216.846";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -46752,6 +48577,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ido-grid-mode";
+        ename = "ido-grid-mode";
         version = "20160122.339";
         src = fetchFromGitHub {
           owner = "larkery";
@@ -46776,6 +48602,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ido-hacks";
+        ename = "ido-hacks";
         version = "20150331.1209";
         src = fetchFromGitHub {
           owner = "scottjad";
@@ -46802,6 +48629,7 @@
                                     , persistent-soft }:
       melpaBuild {
         pname = "ido-load-library";
+        ename = "ido-load-library";
         version = "20140611.900";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -46827,6 +48655,7 @@
                               , migemo }:
       melpaBuild {
         pname = "ido-migemo";
+        ename = "ido-migemo";
         version = "20150921.1544";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -46852,6 +48681,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ido-occasional";
+        ename = "ido-occasional";
         version = "20150214.448";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -46877,6 +48707,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ido-occur";
+        ename = "ido-occur";
         version = "20160820.740";
         src = fetchFromGitHub {
           owner = "danil";
@@ -46902,6 +48733,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ido-select-window";
+        ename = "ido-select-window";
         version = "20131220.1247";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -46928,6 +48760,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ido-skk";
+        ename = "ido-skk";
         version = "20151111.150";
         src = fetchFromGitHub {
           owner = "tsukimizake";
@@ -46952,6 +48785,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ido-sort-mtime";
+        ename = "ido-sort-mtime";
         version = "20171121.59";
         src = fetchFromGitHub {
           owner = "pkkm";
@@ -46976,6 +48810,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ido-springboard";
+        ename = "ido-springboard";
         version = "20170105.2355";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -47000,6 +48835,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ido-vertical-mode";
+        ename = "ido-vertical-mode";
         version = "20180618.1401";
         src = fetchFromGitHub {
           owner = "creichert";
@@ -47025,6 +48861,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ido-yes-or-no";
+        ename = "ido-yes-or-no";
         version = "20161108.1551";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -47049,6 +48886,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "idomenu";
+        ename = "idomenu";
         version = "20141123.1320";
         src = fetchFromGitHub {
           owner = "birkenfeld";
@@ -47076,6 +48914,7 @@
                               , prop-menu }:
       melpaBuild {
         pname = "idris-mode";
+        ename = "idris-mode";
         version = "20180416.2245";
         src = fetchFromGitHub {
           owner = "idris-hackers";
@@ -47101,6 +48940,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ids-edit";
+        ename = "ids-edit";
         version = "20170818.802";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -47125,6 +48965,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "iedit";
+        ename = "iedit";
         version = "20180207.219";
         src = fetchFromGitHub {
           owner = "victorhge";
@@ -47149,6 +48990,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ietf-docs";
+        ename = "ietf-docs";
         version = "20150928.257";
         src = fetchFromGitHub {
           owner = "choppsv1";
@@ -47173,6 +49015,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "iflipb";
+        ename = "iflipb";
         version = "20171113.1244";
         src = fetchFromGitHub {
           owner = "jrosdahl";
@@ -47197,6 +49040,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ignoramus";
+        ename = "ignoramus";
         version = "20160414.709";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47221,6 +49065,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "igv";
+        ename = "igv";
         version = "20141210.427";
         src = fetchgit {
           url = "https://bitbucket.org/sbarbit/eigv";
@@ -47246,6 +49091,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "image-archive";
+        ename = "image-archive";
         version = "20150620.1832";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -47271,6 +49117,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "image-dired-plus";
+        ename = "image-dired+";
         version = "20150429.2244";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -47296,6 +49143,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "image-plus";
+        ename = "image+";
         version = "20150707.916";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -47320,6 +49168,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "imakado";
+        ename = "imakado";
         version = "20141024.223";
         src = fetchFromGitHub {
           owner = "imakado";
@@ -47345,6 +49194,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "imake";
+        ename = "imake";
         version = "20180318.1559";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -47369,6 +49219,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "imapfilter";
+        ename = "imapfilter";
         version = "20180318.1327";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -47394,6 +49245,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "imenu-anywhere";
+        ename = "imenu-anywhere";
         version = "20170805.1155";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -47419,6 +49271,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "imenu-list";
+        ename = "imenu-list";
         version = "20180601.702";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -47444,6 +49297,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "imenus";
+        ename = "imenus";
         version = "20180505.1017";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -47470,6 +49324,7 @@
                          , request }:
       melpaBuild {
         pname = "imgbb";
+        ename = "imgbb";
         version = "20180609.949";
         src = fetchFromGitHub {
           owner = "ecraven";
@@ -47494,6 +49349,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "immortal-scratch";
+        ename = "immortal-scratch";
         version = "20160517.1418";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/immortal-scratch";
@@ -47517,6 +49373,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "immutant-server";
+        ename = "immutant-server";
         version = "20140311.1508";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -47544,6 +49401,7 @@
                                   , simple-httpd }:
       melpaBuild {
         pname = "impatient-mode";
+        ename = "impatient-mode";
         version = "20180528.916";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -47570,6 +49428,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "import-js";
+        ename = "import-js";
         version = "20180709.1133";
         src = fetchFromGitHub {
           owner = "Galooshi";
@@ -47596,6 +49455,7 @@
                                  , popwin }:
       melpaBuild {
         pname = "import-popwin";
+        ename = "import-popwin";
         version = "20170218.607";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -47623,6 +49483,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "importmagic";
+        ename = "importmagic";
         version = "20180519.2003";
         src = fetchFromGitHub {
           owner = "anachronic";
@@ -47647,6 +49508,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "indent-guide";
+        ename = "indent-guide";
         version = "20170221.327";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -47671,6 +49533,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "indent-info";
+        ename = "indent-info";
         version = "20180423.1212";
         src = fetchFromGitHub {
           owner = "terlar";
@@ -47698,6 +49561,7 @@
                                 , yafolding }:
       melpaBuild {
         pname = "indent-tools";
+        ename = "indent-tools";
         version = "20180124.408";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
@@ -47724,6 +49588,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "indicators";
+        ename = "indicators";
         version = "20161211.326";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -47753,6 +49618,7 @@
                           , websocket }:
       melpaBuild {
         pname = "indium";
+        ename = "indium";
         version = "20180521.1355";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -47777,6 +49643,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "indy";
+        ename = "indy";
         version = "20150610.1006";
         src = fetchFromGitHub {
           owner = "kwrooijen";
@@ -47803,6 +49670,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inf-clojure";
+        ename = "inf-clojure";
         version = "20180402.1403";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -47829,6 +49697,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inf-crystal";
+        ename = "inf-crystal";
         version = "20180118.1811";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -47853,6 +49722,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "inf-mongo";
+        ename = "inf-mongo";
         version = "20180408.638";
         src = fetchFromGitHub {
           owner = "tobiassvn";
@@ -47877,6 +49747,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "inf-ruby";
+        ename = "inf-ruby";
         version = "20180521.648";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -47901,6 +49772,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "inferior-spim";
+        ename = "inferior-spim";
         version = "20160826.646";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -47927,6 +49799,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inflections";
+        ename = "inflections";
         version = "20170913.216";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -47952,6 +49825,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "info-beamer";
+        ename = "info-beamer";
         version = "20180604.1422";
         src = fetchFromGitHub {
           owner = "dakra";
@@ -47976,6 +49850,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "info-buffer";
+        ename = "info-buffer";
         version = "20170112.622";
         src = fetchFromGitHub {
           owner = "llvilanova";
@@ -48002,6 +49877,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "info-colors";
+        ename = "info-colors";
         version = "20180205.350";
         src = fetchFromGitHub {
           owner = "ubolonton";
@@ -48027,6 +49903,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "inherit-local";
+        ename = "inherit-local";
         version = "20170409.949";
         src = fetchFromGitHub {
           owner = "shlevy";
@@ -48051,6 +49928,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ini-mode";
+        ename = "ini-mode";
         version = "20170424.209";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -48075,6 +49953,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "init-loader";
+        ename = "init-loader";
         version = "20160528.615";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -48100,6 +49979,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "init-open-recentf";
+        ename = "init-open-recentf";
         version = "20161206.645";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -48124,6 +50004,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "initsplit";
+        ename = "initsplit";
         version = "20160919.1118";
         src = fetchFromGitHub {
           owner = "dabrahams";
@@ -48149,6 +50030,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ink-mode";
+        ename = "ink-mode";
         version = "20160814.416";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -48173,6 +50055,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "inkpot-theme";
+        ename = "inkpot-theme";
         version = "20171217.144";
         src = fetchFromGitHub {
           owner = "ideasman42";
@@ -48197,6 +50080,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "inline-crypt";
+        ename = "inline-crypt";
         version = "20170824.200";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
@@ -48222,6 +50106,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inline-docs";
+        ename = "inline-docs";
         version = "20170522.2150";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -48246,6 +50131,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "inlineR";
+        ename = "inlineR";
         version = "20120520.732";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -48270,6 +50156,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "insert-shebang";
+        ename = "insert-shebang";
         version = "20180403.514";
         src = fetchFromGitHub {
           owner = "psachin";
@@ -48294,6 +50181,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "insfactor";
+        ename = "insfactor";
         version = "20141116.1602";
         src = fetchFromGitHub {
           owner = "duelinmarkers";
@@ -48318,6 +50206,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "instapaper";
+        ename = "instapaper";
         version = "20130104.621";
         src = fetchhg {
           url = "https://bitbucket.com/jfm/emacs-instapaper";
@@ -48341,6 +50230,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "intel-hex-mode";
+        ename = "intel-hex-mode";
         version = "20180422.1731";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -48365,6 +50255,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "intellij-theme";
+        ename = "intellij-theme";
         version = "20171017.715";
         src = fetchFromGitLab {
           owner = "fommil";
@@ -48390,6 +50281,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "interaction-log";
+        ename = "interaction-log";
         version = "20160305.501";
         src = fetchFromGitHub {
           owner = "michael-heerdegen";
@@ -48414,6 +50306,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "interleave";
+        ename = "interleave";
         version = "20171003.2324";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -48442,6 +50335,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "intero";
+        ename = "intero";
         version = "20180703.18";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
@@ -48469,6 +50363,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "interval-list";
+        ename = "interval-list";
         version = "20150327.1018";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -48494,6 +50389,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "interval-tree";
+        ename = "interval-tree";
         version = "20130325.707";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -48520,6 +50416,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "inverse-acme-theme";
+        ename = "inverse-acme-theme";
         version = "20170822.1954";
         src = fetchFromGitHub {
           owner = "dcjohnson";
@@ -48544,6 +50441,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "io-mode";
+        ename = "io-mode";
         version = "20161004.56";
         src = fetchFromGitHub {
           owner = "superbobry";
@@ -48568,6 +50466,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "io-mode-inf";
+        ename = "io-mode-inf";
         version = "20140128.1134";
         src = fetchFromGitHub {
           owner = "slackorama";
@@ -48592,6 +50491,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ioccur";
+        ename = "ioccur";
         version = "20130821.2248";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -48617,6 +50517,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "iodine-theme";
+        ename = "iodine-theme";
         version = "20151031.939";
         src = fetchFromGitHub {
           owner = "srdja";
@@ -48642,6 +50543,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ipcalc";
+        ename = "ipcalc";
         version = "20170926.105";
         src = fetchFromGitHub {
           owner = "dotemacs";
@@ -48666,6 +50568,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "iplayer";
+        ename = "iplayer";
         version = "20161120.1320";
         src = fetchFromGitHub {
           owner = "csrhodes";
@@ -48690,6 +50593,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ipretty";
+        ename = "ipretty";
         version = "20180605.2222";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/ipretty.git";
@@ -48714,6 +50618,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ipython-shell-send";
+        ename = "ipython-shell-send";
         version = "20171212.318";
         src = fetchFromGitHub {
           owner = "jackkamm";
@@ -48739,6 +50644,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "iqa";
+        ename = "iqa";
         version = "20170722.834";
         src = fetchFromGitHub {
           owner = "a13";
@@ -48763,6 +50669,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ir-black-theme";
+        ename = "ir-black-theme";
         version = "20130302.2355";
         src = fetchFromGitHub {
           owner = "jmdeldin";
@@ -48787,6 +50694,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "iregister";
+        ename = "iregister";
         version = "20150515.1407";
         src = fetchFromGitHub {
           owner = "atykhonov";
@@ -48813,6 +50721,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "irony";
+        ename = "irony";
         version = "20180703.1040";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -48840,6 +50749,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "irony-eldoc";
+        ename = "irony-eldoc";
         version = "20170502.1208";
         src = fetchFromGitHub {
           owner = "ikirill";
@@ -48865,6 +50775,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "isearch-dabbrev";
+        ename = "isearch-dabbrev";
         version = "20141223.2222";
         src = fetchFromGitHub {
           owner = "Dewdrops";
@@ -48889,6 +50800,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "isearch-symbol-at-point";
+        ename = "isearch-symbol-at-point";
         version = "20130728.1521";
         src = fetchFromGitHub {
           owner = "re5et";
@@ -48913,6 +50825,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "isend-mode";
+        ename = "isend-mode";
         version = "20171118.745";
         src = fetchFromGitHub {
           owner = "ffevotte";
@@ -48937,6 +50850,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "isgd";
+        ename = "isgd";
         version = "20150414.236";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -48963,6 +50877,7 @@
                             , pythonic }:
       melpaBuild {
         pname = "isortify";
+        ename = "isortify";
         version = "20180612.622";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -48987,6 +50902,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "iss-mode";
+        ename = "iss-mode";
         version = "20141001.1213";
         src = fetchFromGitHub {
           owner = "rasmus-toftdahl-olesen";
@@ -49011,6 +50927,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "itail";
+        ename = "itail";
         version = "20171112.4";
         src = fetchFromGitHub {
           owner = "re5et";
@@ -49036,6 +50953,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "itasca";
+        ename = "itasca";
         version = "20170601.922";
         src = fetchFromGitHub {
           owner = "jkfurtney";
@@ -49061,6 +50979,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "iter2";
+        ename = "iter2";
         version = "20180510.633";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -49087,6 +51006,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "iterator";
+        ename = "iterator";
         version = "20170207.38";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -49113,6 +51033,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivariants";
+        ename = "ivariants";
         version = "20170822.1924";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -49140,6 +51061,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ivs-edit";
+        ename = "ivs-edit";
         version = "20170818.741";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -49165,12 +51087,13 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ivy";
-        version = "20180713.946";
+        ename = "ivy";
+        version = "20180719.1037";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
-          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
+          rev = "31e18fd15780c5f6eedbe3d6a14f86aade673d01";
+          sha256 = "0xv9ddgq218xy68bbf7d8l243g932viwlqmlk04jmalk3qyv4hj9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -49196,6 +51119,7 @@
                               , swiper }:
       melpaBuild {
         pname = "ivy-bibtex";
+        ename = "ivy-bibtex";
         version = "20180612.619";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -49223,6 +51147,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ivy-dired-history";
+        ename = "ivy-dired-history";
         version = "20170625.2256";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -49252,12 +51177,13 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20180311.558";
+        ename = "ivy-erlang-complete";
+        version = "20180715.2144";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "62e2b14ff25b0c143c882cb38d029b216acc3dd6";
-          sha256 = "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568";
+          rev = "6dad91e4951ed6fd8886bfee587144da18b57049";
+          sha256 = "1padq39s8k4p16bgxi0cyy1q0rqa89w38a0nzkc3kvnq3iycixlp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -49276,6 +51202,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ivy-feedwrangler";
+        ename = "ivy-feedwrangler";
         version = "20180618.822";
         src = fetchFromGitHub {
           owner = "asimpson";
@@ -49304,6 +51231,7 @@
                               , s }:
       melpaBuild {
         pname = "ivy-gitlab";
+        ename = "ivy-gitlab";
         version = "20180312.947";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -49332,6 +51260,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ivy-historian";
+        ename = "ivy-historian";
         version = "20170715.2120";
         src = fetchFromGitHub {
           owner = "PythonNut";
@@ -49359,6 +51288,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivy-hydra";
+        ename = "ivy-hydra";
         version = "20180614.1500";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -49385,6 +51315,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ivy-lobsters";
+        ename = "ivy-lobsters";
         version = "20171202.1241";
         src = fetchFromGitHub {
           owner = "julienXX";
@@ -49413,6 +51344,7 @@
                              , mpdel }:
       melpaBuild {
         pname = "ivy-mpdel";
+        ename = "ivy-mpdel";
         version = "20180502.1148";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -49439,6 +51371,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivy-pages";
+        ename = "ivy-pages";
         version = "20160728.1220";
         src = fetchFromGitHub {
           owner = "igorepst";
@@ -49466,6 +51399,7 @@
                             , password-store }:
       melpaBuild {
         pname = "ivy-pass";
+        ename = "ivy-pass";
         version = "20170812.1255";
         src = fetchFromGitHub {
           owner = "ecraven";
@@ -49493,6 +51427,7 @@
                                , phpunit }:
       melpaBuild {
         pname = "ivy-phpunit";
+        ename = "ivy-phpunit";
         version = "20180219.115";
         src = fetchFromGitHub {
           owner = "12pt";
@@ -49520,6 +51455,7 @@
                                 , posframe }:
       melpaBuild {
         pname = "ivy-posframe";
+        ename = "ivy-posframe";
         version = "20180707.2016";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -49547,12 +51483,13 @@
                                  , prescient }:
       melpaBuild {
         pname = "ivy-prescient";
-        version = "20180714.825";
+        ename = "ivy-prescient";
+        version = "20180716.907";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "f9ac261eb45faef9a87c36b997d9a496fe63d1cd";
-          sha256 = "0kjz6wdyhvs4mbp0n1avprx4mwyx3az5p1sak6c4xnqdqnn2azly";
+          rev = "a1464272d62f4054c314d1a3196f7b7673325752";
+          sha256 = "1w6xbyrk48mdv7iyspqkjv7ppp4r8rf1dispk08p8qig2d9crvl7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
@@ -49574,6 +51511,7 @@
                                , window-purpose }:
       melpaBuild {
         pname = "ivy-purpose";
+        ename = "ivy-purpose";
         version = "20160724.303";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -49600,6 +51538,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ivy-rich";
+        ename = "ivy-rich";
         version = "20180704.1845";
         src = fetchFromGitHub {
           owner = "yevgnen";
@@ -49626,6 +51565,7 @@
                              , rtags }:
       melpaBuild {
         pname = "ivy-rtags";
+        ename = "ivy-rtags";
         version = "20170522.2154";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -49652,6 +51592,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ivy-todo";
+        ename = "ivy-todo";
         version = "20171208.809";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -49678,6 +51619,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivy-xcdoc";
+        ename = "ivy-xcdoc";
         version = "20160917.355";
         src = fetchFromGitHub {
           owner = "hex2010";
@@ -49704,6 +51646,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ivy-xref";
+        ename = "ivy-xref";
         version = "20180701.2117";
         src = fetchFromGitHub {
           owner = "alexmurray";
@@ -49732,6 +51675,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "ivy-yasnippet";
+        ename = "ivy-yasnippet";
         version = "20180620.2336";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -49759,6 +51703,7 @@
                                , request }:
       melpaBuild {
         pname = "ivy-youtube";
+        ename = "ivy-youtube";
         version = "20171112.732";
         src = fetchFromGitHub {
           owner = "squiter";
@@ -49784,6 +51729,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ix";
+        ename = "ix";
         version = "20131027.929";
         src = fetchFromGitHub {
           owner = "theanalyst";
@@ -49808,6 +51754,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "iy-go-to-char";
+        ename = "iy-go-to-char";
         version = "20141029.846";
         src = fetchFromGitHub {
           owner = "doitian";
@@ -49832,6 +51779,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "j-mode";
+        ename = "j-mode";
         version = "20171224.1056";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -49857,6 +51805,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "jabber";
+        ename = "jabber";
         version = "20170423.513";
         src = fetchgit {
           url = "https://github.com/legoscia/emacs-jabber.git";
@@ -49882,6 +51831,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "jabber-otr";
+        ename = "jabber-otr";
         version = "20150918.444";
         src = fetchFromGitHub {
           owner = "legoscia";
@@ -49906,6 +51856,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jack-connect";
+        ename = "jack-connect";
         version = "20141207.407";
         src = fetchgit {
           url = "https://bitbucket.org/sbarbit/jack-connect";
@@ -49929,6 +51880,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jade-mode";
+        ename = "jade-mode";
         version = "20160525.741";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -49953,6 +51905,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "jammer";
+        ename = "jammer";
         version = "20160310.59";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -49978,6 +51931,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "japanese-holidays";
+        ename = "japanese-holidays";
         version = "20160927.2318";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -50003,6 +51957,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "japanlaw";
+        ename = "japanlaw";
         version = "20160129.20";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -50027,6 +51982,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jape-mode";
+        ename = "jape-mode";
         version = "20140903.806";
         src = fetchFromGitHub {
           owner = "tanzoniteblack";
@@ -50051,6 +52007,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "jar-manifest-mode";
+        ename = "jar-manifest-mode";
         version = "20160430.1726";
         src = fetchFromGitHub {
           owner = "omajid";
@@ -50075,6 +52032,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "jasminejs-mode";
+        ename = "jasminejs-mode";
         version = "20150526.1705";
         src = fetchFromGitHub {
           owner = "stoltene2";
@@ -50100,6 +52058,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "jastadd-ast-mode";
+        ename = "jastadd-ast-mode";
         version = "20161219.126";
         src = fetchFromGitHub {
           owner = "rudi";
@@ -50127,6 +52086,7 @@
                                 , s }:
       melpaBuild {
         pname = "java-imports";
+        ename = "java-imports";
         version = "20170913.710";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -50152,6 +52112,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "java-snippets";
+        ename = "java-snippets";
         version = "20160626.1952";
         src = fetchFromGitHub {
           owner = "nekop";
@@ -50177,6 +52138,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "javadoc-lookup";
+        ename = "javadoc-lookup";
         version = "20160213.1631";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -50201,6 +52163,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "javap-mode";
+        ename = "javap-mode";
         version = "20120223.1408";
         src = fetchFromGitHub {
           owner = "hiredman";
@@ -50226,6 +52189,7 @@
                           , tinysegmenter }:
       melpaBuild {
         pname = "jaword";
+        ename = "jaword";
         version = "20170425.2327";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -50250,6 +52214,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "jazz-theme";
+        ename = "jazz-theme";
         version = "20170411.711";
         src = fetchFromGitHub {
           owner = "donderom";
@@ -50275,6 +52240,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jbeans-theme";
+        ename = "jbeans-theme";
         version = "20180309.825";
         src = fetchFromGitHub {
           owner = "synic";
@@ -50300,6 +52266,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "jdecomp";
+        ename = "jdecomp";
         version = "20170224.1400";
         src = fetchFromGitHub {
           owner = "xiongtx";
@@ -50329,6 +52296,7 @@
                         , s }:
       melpaBuild {
         pname = "jdee";
+        ename = "jdee";
         version = "20180711.1336";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
@@ -50356,6 +52324,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jedi";
+        ename = "jedi";
         version = "20160425.2156";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -50384,6 +52353,7 @@
                              , python-environment }:
       melpaBuild {
         pname = "jedi-core";
+        ename = "jedi-core";
         version = "20170121.610";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -50410,6 +52380,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "jedi-direx";
+        ename = "jedi-direx";
         version = "20140310.236";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -50435,6 +52406,7 @@
                                 , polymode }:
       melpaBuild {
         pname = "jekyll-modes";
+        ename = "jekyll-modes";
         version = "20141117.514";
         src = fetchFromGitHub {
           owner = "fred-o";
@@ -50460,6 +52432,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "jemdoc-mode";
+        ename = "jemdoc-mode";
         version = "20170704.1327";
         src = fetchFromGitHub {
           owner = "drdv";
@@ -50487,6 +52460,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "jenkins";
+        ename = "jenkins";
         version = "20170721.236";
         src = fetchFromGitHub {
           owner = "rmuslimov";
@@ -50511,6 +52485,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "jenkins-watch";
+        ename = "jenkins-watch";
         version = "20121004.1626";
         src = fetchFromGitHub {
           owner = "ataylor284";
@@ -50538,6 +52513,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jetbrains";
+        ename = "jetbrains";
         version = "20180228.2102";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -50564,6 +52540,7 @@
                                , s }:
       melpaBuild {
         pname = "jg-quicknav";
+        ename = "jg-quicknav";
         version = "20170808.1830";
         src = fetchFromGitHub {
           owner = "jeffgran";
@@ -50588,6 +52565,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "jinja2-mode";
+        ename = "jinja2-mode";
         version = "20141128.207";
         src = fetchFromGitHub {
           owner = "paradoxxxzero";
@@ -50612,6 +52590,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "jira-markup-mode";
+        ename = "jira-markup-mode";
         version = "20150601.1409";
         src = fetchFromGitHub {
           owner = "mnuessler";
@@ -50642,6 +52621,7 @@
                         , seq }:
       melpaBuild {
         pname = "jist";
+        ename = "jist";
         version = "20161229.921";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -50666,6 +52646,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "jknav";
+        ename = "jknav";
         version = "20121006.1325";
         src = fetchFromGitHub {
           owner = "aculich";
@@ -50693,6 +52674,7 @@
                                , yasnippet }:
       melpaBuild {
         pname = "jonprl-mode";
+        ename = "jonprl-mode";
         version = "20160818.1759";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -50720,6 +52702,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jpop";
+        ename = "jpop";
         version = "20170410.550";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -50745,6 +52728,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "jq-mode";
+        ename = "jq-mode";
         version = "20180407.1048";
         src = fetchFromGitHub {
           owner = "ljos";
@@ -50769,6 +52753,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "jquery-doc";
+        ename = "jquery-doc";
         version = "20150812.58";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -50795,6 +52780,7 @@
                                     , web-mode }:
       melpaBuild {
         pname = "js-auto-beautify";
+        ename = "js-auto-beautify";
         version = "20161030.2209";
         src = fetchFromGitHub {
           owner = "Qquanwei";
@@ -50820,6 +52806,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "js-auto-format-mode";
+        ename = "js-auto-format-mode";
         version = "20180123.830";
         src = fetchFromGitHub {
           owner = "ybiquitous";
@@ -50845,6 +52832,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "js-codemod";
+        ename = "js-codemod";
         version = "20171104.454";
         src = fetchFromGitHub {
           owner = "torgeir";
@@ -50870,6 +52858,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "js-comint";
+        ename = "js-comint";
         version = "20171129.2056";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -50894,6 +52883,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "js-doc";
+        ename = "js-doc";
         version = "20160714.2134";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -50920,6 +52910,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "js-format";
+        ename = "js-format";
         version = "20170118.1702";
         src = fetchFromGitHub {
           owner = "futurist";
@@ -50948,6 +52939,7 @@
                              , projectile }:
       melpaBuild {
         pname = "js-import";
+        ename = "js-import";
         version = "20170115.853";
         src = fetchFromGitHub {
           owner = "jakoblind";
@@ -50973,6 +52965,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "js2-closure";
+        ename = "js2-closure";
         version = "20170816.1218";
         src = fetchFromGitHub {
           owner = "jart";
@@ -50999,6 +52992,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "js2-highlight-vars";
+        ename = "js2-highlight-vars";
         version = "20170418.1129";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -51025,6 +53019,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "js2-mode";
+        ename = "js2-mode";
         version = "20180627.744";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -51054,6 +53049,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "js2-refactor";
+        ename = "js2-refactor";
         version = "20180502.342";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -51078,6 +53074,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "js3-mode";
+        ename = "js3-mode";
         version = "20160515.850";
         src = fetchFromGitHub {
           owner = "thomblake";
@@ -51104,6 +53101,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jscs";
+        ename = "jscs";
         version = "20151015.1049";
         src = fetchFromGitHub {
           owner = "papaeye";
@@ -51128,6 +53126,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "jsfmt";
+        ename = "jsfmt";
         version = "20150727.1525";
         src = fetchFromGitHub {
           owner = "brettlangdon";
@@ -51154,12 +53153,13 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "json-mode";
-        version = "20170719.2205";
+        ename = "json-mode";
+        version = "20180718.109";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4";
-          sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww";
+          rev = "ffc92b1eefc54963703b43be140f4c8c8ad348f7";
+          sha256 = "186m03fhbv8v8kz5nmhrsakhl2mh0hn365yrx36i28i8mbnwzah7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -51180,6 +53180,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "json-navigator";
+        ename = "json-navigator";
         version = "20171220.19";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -51204,6 +53205,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "json-reformat";
+        ename = "json-reformat";
         version = "20160212.53";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -51230,6 +53232,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "json-rpc";
+        ename = "json-rpc";
         version = "20180104.728";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -51255,6 +53258,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "json-snatcher";
+        ename = "json-snatcher";
         version = "20150511.2047";
         src = fetchFromGitHub {
           owner = "Sterlingg";
@@ -51280,6 +53284,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jsonnet-mode";
+        ename = "jsonnet-mode";
         version = "20180310.2256";
         src = fetchFromGitHub {
           owner = "mgyucht";
@@ -51307,6 +53312,7 @@
                        , websocket }:
       melpaBuild {
         pname = "jss";
+        ename = "jss";
         version = "20130508.723";
         src = fetchFromGitHub {
           owner = "segv";
@@ -51336,6 +53342,7 @@
                        , s }:
       melpaBuild {
         pname = "jst";
+        ename = "jst";
         version = "20150604.438";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -51360,6 +53367,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "jsx-mode";
+        ename = "jsx-mode";
         version = "20130908.1024";
         src = fetchFromGitHub {
           owner = "jsx";
@@ -51384,6 +53392,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "jtags";
+        ename = "jtags";
         version = "20160211.1229";
         src = fetchgit {
           url = "https://git.code.sf.net/p/jtags/code";
@@ -51407,6 +53416,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "julia-mode";
+        ename = "julia-mode";
         version = "20171116.642";
         src = fetchFromGitHub {
           owner = "JuliaLang";
@@ -51432,6 +53442,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "julia-repl";
+        ename = "julia-repl";
         version = "20171116.46";
         src = fetchFromGitHub {
           owner = "tpapp";
@@ -51457,6 +53468,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "julia-shell";
+        ename = "julia-shell";
         version = "20161125.1110";
         src = fetchFromGitHub {
           owner = "dennisog";
@@ -51483,6 +53495,7 @@
                           , s }:
       melpaBuild {
         pname = "jumblr";
+        ename = "jumblr";
         version = "20170727.1343";
         src = fetchFromGitHub {
           owner = "mkmcc";
@@ -51510,6 +53523,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jump";
+        ename = "jump";
         version = "20161126.1728";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -51534,6 +53548,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jump-char";
+        ename = "jump-char";
         version = "20180601.648";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -51558,6 +53573,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jump-to-line";
+        ename = "jump-to-line";
         version = "20130122.853";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -51582,6 +53598,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jump-tree";
+        ename = "jump-tree";
         version = "20171014.851";
         src = fetchFromGitHub {
           owner = "yangwen0228";
@@ -51607,6 +53624,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "jumplist";
+        ename = "jumplist";
         version = "20151119.1945";
         src = fetchFromGitHub {
           owner = "ganmacs";
@@ -51633,6 +53651,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "jvm-mode";
+        ename = "jvm-mode";
         version = "20150422.8";
         src = fetchFromGitHub {
           owner = "martintrojer";
@@ -51658,6 +53677,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "kaesar";
+        ename = "kaesar";
         version = "20160128.208";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -51683,6 +53703,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kaesar-file";
+        ename = "kaesar-file";
         version = "20160128.208";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -51709,6 +53730,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kaesar-mode";
+        ename = "kaesar-mode";
         version = "20160128.208";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -51734,6 +53756,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kakapo-mode";
+        ename = "kakapo-mode";
         version = "20171003.2151";
         src = fetchFromGitHub {
           owner = "listx";
@@ -51759,6 +53782,7 @@
                                 , s }:
       melpaBuild {
         pname = "kaleidoscope";
+        ename = "kaleidoscope";
         version = "20170808.117";
         src = fetchFromGitHub {
           owner = "algernon";
@@ -51786,6 +53810,7 @@
                                                  , s }:
       melpaBuild {
         pname = "kaleidoscope-evil-state-flash";
+        ename = "kaleidoscope-evil-state-flash";
         version = "20170728.320";
         src = fetchFromGitHub {
           owner = "algernon";
@@ -51810,6 +53835,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "kanban";
+        ename = "kanban";
         version = "20170418.110";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/kanban.el";
@@ -51833,6 +53859,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "kanji-mode";
+        ename = "kanji-mode";
         version = "20160826.439";
         src = fetchFromGitHub {
           owner = "wsgac";
@@ -51860,12 +53887,13 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "kaolin-themes";
-        version = "20180627.1013";
+        ename = "kaolin-themes";
+        version = "20180722.1037";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "e183b7adb06338046f1a17a94e18ec67e62d4e42";
-          sha256 = "1mvspqll53p8rz66588lvdflwfx4av6cnzigid6n10d1cy35p5vg";
+          rev = "8d0d8513541c293646aaff886d1fb81621d3cf45";
+          sha256 = "00bn5wr4wvdn4nn1minlqnbj57rdb8biv4w9bmkgipsmkr27zaxz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -51886,6 +53914,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "kaomoji";
+        ename = "kaomoji";
         version = "20171226.2040";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -51912,6 +53941,7 @@
                          , pkg-info }:
       melpaBuild {
         pname = "karma";
+        ename = "karma";
         version = "20160220.445";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -51936,6 +53966,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "kdeconnect";
+        ename = "kdeconnect";
         version = "20180126.1540";
         src = fetchFromGitHub {
           owner = "carldotac";
@@ -51960,6 +53991,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "kerl";
+        ename = "kerl";
         version = "20150424.1305";
         src = fetchFromGitHub {
           owner = "correl";
@@ -51984,6 +54016,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "key-chord";
+        ename = "key-chord";
         version = "20160227.438";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -52008,6 +54041,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "key-combo";
+        ename = "key-combo";
         version = "20150324.739";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -52032,6 +54066,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "key-intercept";
+        ename = "key-intercept";
         version = "20140210.2349";
         src = fetchFromGitHub {
           owner = "tarao";
@@ -52057,6 +54092,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "key-leap";
+        ename = "key-leap";
         version = "20160831.747";
         src = fetchFromGitHub {
           owner = "MartinRykfors";
@@ -52082,6 +54118,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "key-seq";
+        ename = "key-seq";
         version = "20150907.56";
         src = fetchFromGitHub {
           owner = "vlevit";
@@ -52107,6 +54144,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "keycast";
+        ename = "keycast";
         version = "20180318.1321";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -52131,6 +54169,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "keychain-environment";
+        ename = "keychain-environment";
         version = "20180318.1523";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -52155,6 +54194,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "keydef";
+        ename = "keydef";
         version = "20090428.1231";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -52180,6 +54220,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "keyfreq";
+        ename = "keyfreq";
         version = "20160516.716";
         src = fetchFromGitHub {
           owner = "dacap";
@@ -52205,6 +54246,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "keymap-utils";
+        ename = "keymap-utils";
         version = "20180318.1537";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -52231,6 +54273,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "keyset";
+        ename = "keyset";
         version = "20150219.2130";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -52256,6 +54299,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "keyswap";
+        ename = "keyswap";
         version = "20160813.257";
         src = fetchFromGitHub {
           owner = "hardenedapple";
@@ -52280,6 +54324,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "keyword-search";
+        ename = "keyword-search";
         version = "20180424.402";
         src = fetchFromGitHub {
           owner = "keyword-search";
@@ -52298,6 +54343,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    kfg = callPackage ({ f
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "kfg";
+        version = "20140908.2238";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "kfg";
+          rev = "d2c9dd26618fb2f7bf1e7b6eae193b1cceba3c97";
+          sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b212de583b43dd05d2acd15bb2245e735d0b14c/recipes/kfg";
+          sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
+          name = "kfg";
+        };
+        packageRequires = [ f ];
+        meta = {
+          homepage = "https://melpa.org/#/kfg";
+          license = lib.licenses.free;
+        };
+      }) {};
     kibit-helper = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -52306,6 +54376,7 @@
                                 , s }:
       melpaBuild {
         pname = "kibit-helper";
+        ename = "kibit-helper";
         version = "20150508.833";
         src = fetchFromGitHub {
           owner = "brunchboy";
@@ -52332,6 +54403,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "kill-or-bury-alive";
+        ename = "kill-or-bury-alive";
         version = "20171231.2218";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -52356,6 +54428,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "kill-ring-search";
+        ename = "kill-ring-search";
         version = "20140422.855";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -52380,6 +54453,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "killer";
+        ename = "killer";
         version = "20120808.422";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -52406,6 +54480,7 @@
                         , websocket }:
       melpaBuild {
         pname = "kite";
+        ename = "kite";
         version = "20130201.1138";
         src = fetchFromGitHub {
           owner = "jscheid";
@@ -52432,6 +54507,7 @@
                              , websocket }:
       melpaBuild {
         pname = "kite-mini";
+        ename = "kite-mini";
         version = "20160508.406";
         src = fetchFromGitHub {
           owner = "tungd";
@@ -52456,6 +54532,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "kivy-mode";
+        ename = "kivy-mode";
         version = "20180702.1329";
         src = fetchFromGitHub {
           owner = "kivy";
@@ -52482,6 +54559,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "kiwix";
+        ename = "kiwix";
         version = "20170927.120";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -52507,6 +54585,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "kixtart-mode";
+        ename = "kixtart-mode";
         version = "20150611.904";
         src = fetchFromGitHub {
           owner = "ryrun";
@@ -52532,6 +54611,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "klere-theme";
+        ename = "klere-theme";
         version = "20180415.1123";
         src = fetchFromGitHub {
           owner = "WammKD";
@@ -52556,6 +54636,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "know-your-http-well";
+        ename = "know-your-http-well";
         version = "20160208.1504";
         src = fetchFromGitHub {
           owner = "for-GET";
@@ -52584,6 +54665,7 @@
                                , request }:
       melpaBuild {
         pname = "kodi-remote";
+        ename = "kodi-remote";
         version = "20180609.1654";
         src = fetchFromGitHub {
           owner = "spiderbit";
@@ -52608,6 +54690,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "kolon-mode";
+        ename = "kolon-mode";
         version = "20140122.334";
         src = fetchFromGitHub {
           owner = "samvtran";
@@ -52633,6 +54716,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "kooten-theme";
+        ename = "kooten-theme";
         version = "20161023.205";
         src = fetchFromGitHub {
           owner = "kootenpv";
@@ -52657,6 +54741,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "korean-holidays";
+        ename = "korean-holidays";
         version = "20170228.2045";
         src = fetchFromGitHub {
           owner = "tttuuu888";
@@ -52682,6 +54767,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "kosmos-theme";
+        ename = "kosmos-theme";
         version = "20170502.1150";
         src = fetchFromGitHub {
           owner = "habamax";
@@ -52707,6 +54793,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kotlin-mode";
+        ename = "kotlin-mode";
         version = "20180219.853";
         src = fetchFromGitHub {
           owner = "Emacs-Kotlin-Mode-Maintainers";
@@ -52731,6 +54818,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "kpm-list";
+        ename = "kpm-list";
         version = "20170924.652";
         src = fetchFromGitHub {
           owner = "KMahoney";
@@ -52755,6 +54843,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "kroman";
+        ename = "kroman";
         version = "20150827.1640";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -52780,6 +54869,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ksp-cfg-mode";
+        ename = "ksp-cfg-mode";
         version = "20180608.2247";
         src = fetchFromGitHub {
           owner = "lashtear";
@@ -52807,6 +54897,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "kubernetes";
+        ename = "kubernetes";
         version = "20180706.520";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -52833,6 +54924,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "kubernetes-evil";
+        ename = "kubernetes-evil";
         version = "20171122.1819";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -52859,6 +54951,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "kubernetes-tramp";
+        ename = "kubernetes-tramp";
         version = "20171026.922";
         src = fetchFromGitHub {
           owner = "gruggiero";
@@ -52885,6 +54978,7 @@
                              , s }:
       melpaBuild {
         pname = "kurecolor";
+        ename = "kurecolor";
         version = "20180401.521";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -52909,6 +55003,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "kv";
+        ename = "kv";
         version = "20140108.734";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -52933,6 +55028,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "kwin";
+        ename = "kwin";
         version = "20150308.1112";
         src = fetchFromGitHub {
           owner = "reactormonk";
@@ -52957,6 +55053,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "labburn-theme";
+        ename = "labburn-theme";
         version = "20170502.207";
         src = fetchFromGitHub {
           owner = "ksjogo";
@@ -52981,6 +55078,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "lang-refactor-perl";
+        ename = "lang-refactor-perl";
         version = "20131122.1327";
         src = fetchFromGitHub {
           owner = "jplindstrom";
@@ -53006,6 +55104,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "langdoc";
+        ename = "langdoc";
         version = "20150217.2245";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -53031,6 +55130,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "langtool";
+        ename = "langtool";
         version = "20180409.316";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -53057,6 +55157,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "language-detection";
+        ename = "language-detection";
         version = "20161123.1013";
         src = fetchFromGitHub {
           owner = "andreasjansson";
@@ -53084,6 +55185,7 @@
                             , seq }:
       melpaBuild {
         pname = "lastpass";
+        ename = "lastpass";
         version = "20171208.216";
         src = fetchFromGitHub {
           owner = "storvik";
@@ -53110,6 +55212,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "latex-extra";
+        ename = "latex-extra";
         version = "20170816.1847";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -53134,6 +55237,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "latex-math-preview";
+        ename = "latex-math-preview";
         version = "20170522.1455";
         src = fetchFromGitLab {
           owner = "latex-math-preview";
@@ -53158,6 +55262,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "latex-pretty-symbols";
+        ename = "latex-pretty-symbols";
         version = "20151112.244";
         src = fetchhg {
           url = "https://bitbucket.com/mortiferus/latex-pretty-symbols.el";
@@ -53181,6 +55286,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "latex-preview-pane";
+        ename = "latex-preview-pane";
         version = "20180222.951";
         src = fetchFromGitHub {
           owner = "jsinglet";
@@ -53205,6 +55311,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "latex-unicode-math-mode";
+        ename = "latex-unicode-math-mode";
         version = "20170123.1016";
         src = fetchFromGitHub {
           owner = "Christoph-D";
@@ -53230,6 +55337,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "latexdiff";
+        ename = "latexdiff";
         version = "20180521.1532";
         src = fetchFromGitHub {
           owner = "galaunay";
@@ -53254,6 +55362,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "launch";
+        ename = "launch";
         version = "20130619.1504";
         src = fetchFromGitHub {
           owner = "sfllaw";
@@ -53279,6 +55388,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "launch-mode";
+        ename = "launch-mode";
         version = "20170105.2112";
         src = fetchFromGitHub {
           owner = "iory";
@@ -53304,6 +55414,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "launchctl";
+        ename = "launchctl";
         version = "20150518.609";
         src = fetchFromGitHub {
           owner = "pekingduck";
@@ -53329,6 +55440,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "lavender-theme";
+        ename = "lavender-theme";
         version = "20170808.613";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -53354,6 +55466,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lcb-mode";
+        ename = "lcb-mode";
         version = "20160815.2240";
         src = fetchFromGitHub {
           owner = "peter-b";
@@ -53380,6 +55493,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "lcr";
+        ename = "lcr";
         version = "20180414.1256";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -53410,6 +55524,7 @@
                              , s }:
       melpaBuild {
         pname = "lean-mode";
+        ename = "lean-mode";
         version = "20180712.57";
         src = fetchFromGitHub {
           owner = "leanprover";
@@ -53441,6 +55556,7 @@
                            , s }:
       melpaBuild {
         pname = "leanote";
+        ename = "leanote";
         version = "20161222.1739";
         src = fetchFromGitHub {
           owner = "aborn";
@@ -53466,6 +55582,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ledger-mode";
+        ename = "ledger-mode";
         version = "20180705.138";
         src = fetchFromGitHub {
           owner = "ledger";
@@ -53490,6 +55607,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "leerzeichen";
+        ename = "leerzeichen";
         version = "20170422.613";
         src = fetchFromGitHub {
           owner = "fgeller";
@@ -53514,6 +55632,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "legalese";
+        ename = "legalese";
         version = "20150820.1024";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -53538,6 +55657,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "lemon-mode";
+        ename = "lemon-mode";
         version = "20130216.504";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -53563,6 +55683,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "lenlen-theme";
+        ename = "lenlen-theme";
         version = "20170328.1945";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -53592,6 +55713,7 @@
                           , s }:
       melpaBuild {
         pname = "lentic";
+        ename = "lentic";
         version = "20161202.1352";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -53618,6 +55740,7 @@
                                  , web-server }:
       melpaBuild {
         pname = "lentic-server";
+        ename = "lentic-server";
         version = "20160717.1352";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -53642,6 +55765,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "less-css-mode";
+        ename = "less-css-mode";
         version = "20160930.2153";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -53666,6 +55790,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "letcheck";
+        ename = "letcheck";
         version = "20160202.1148";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -53691,6 +55816,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "letterbox-mode";
+        ename = "letterbox-mode";
         version = "20170701.1825";
         src = fetchFromGitHub {
           owner = "pacha64";
@@ -53715,6 +55841,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "leuven-theme";
+        ename = "leuven-theme";
         version = "20170919.252";
         src = fetchFromGitHub {
           owner = "fniessen";
@@ -53739,6 +55866,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "levenshtein";
+        ename = "levenshtein";
         version = "20090830.340";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -53763,6 +55891,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "lexbind-mode";
+        ename = "lexbind-mode";
         version = "20141027.729";
         src = fetchFromGitHub {
           owner = "spacebat";
@@ -53787,6 +55916,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lfe-mode";
+        ename = "lfe-mode";
         version = "20170121.454";
         src = fetchFromGitHub {
           owner = "rvirding";
@@ -53813,6 +55943,7 @@
                               , request }:
       melpaBuild {
         pname = "libelcouch";
+        ename = "libelcouch";
         version = "20180604.53";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -53838,6 +55969,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "libgit";
+        ename = "libgit";
         version = "20180624.2359";
         src = fetchFromGitHub {
           owner = "magit";
@@ -53862,6 +55994,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "libmpdee";
+        ename = "libmpdee";
         version = "20160117.1501";
         src = fetchFromGitHub {
           owner = "andyetitmoves";
@@ -53887,6 +56020,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "libmpdel";
+        ename = "libmpdel";
         version = "20180606.453";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -53911,6 +56045,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "lice";
+        ename = "lice";
         version = "20170220.143";
         src = fetchFromGitHub {
           owner = "buzztaiki";
@@ -53936,6 +56071,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "light-soap-theme";
+        ename = "light-soap-theme";
         version = "20150607.745";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -53962,6 +56098,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "line-reminder";
+        ename = "line-reminder";
         version = "20180602.2252";
         src = fetchFromGitHub {
           owner = "jcs090218";
@@ -53986,6 +56123,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "line-up-words";
+        ename = "line-up-words";
         version = "20180219.224";
         src = fetchFromGitHub {
           owner = "janestreet";
@@ -54011,6 +56149,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "lines-at-once";
+        ename = "lines-at-once";
         version = "20180421.1947";
         src = fetchFromGitHub {
           owner = "jiahaowork";
@@ -54035,6 +56174,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "lingr";
+        ename = "lingr";
         version = "20100807.1031";
         src = fetchFromGitHub {
           owner = "lugecy";
@@ -54059,6 +56199,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "link";
+        ename = "link";
         version = "20140717.2029";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -54086,6 +56227,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "link-hint";
+        ename = "link-hint";
         version = "20180519.1430";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -54110,6 +56252,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "linphone";
+        ename = "linphone";
         version = "20130524.409";
         src = fetchFromGitHub {
           owner = "zabbal";
@@ -54134,6 +56277,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "linum-off";
+        ename = "linum-off";
         version = "20160217.1337";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -54158,6 +56302,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "linum-relative";
+        ename = "linum-relative";
         version = "20180124.247";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -54189,6 +56334,7 @@
                                 , pos-tip }:
       melpaBuild {
         pname = "liquid-types";
+        ename = "liquid-types";
         version = "20151201.2335";
         src = fetchFromGitHub {
           owner = "ucsd-progsys";
@@ -54221,6 +56367,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "liso-theme";
+        ename = "liso-theme";
         version = "20160410.1329";
         src = fetchFromGitHub {
           owner = "caisah";
@@ -54245,6 +56392,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "lisp-extra-font-lock";
+        ename = "lisp-extra-font-lock";
         version = "20160930.1227";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -54269,6 +56417,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "lispxmp";
+        ename = "lispxmp";
         version = "20170925.1723";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -54299,12 +56448,13 @@
                          , zoutline }:
       melpaBuild {
         pname = "lispy";
-        version = "20180712.807";
+        ename = "lispy";
+        version = "20180716.839";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "591d0d616c31b937ef2d44bc517f53ed83934a64";
-          sha256 = "0s2a38h42g4mrv2l5k99n3iqy1llkgmjq6nw648pizvhnm27f5br";
+          rev = "a8b0e0afb73b7687cae370fc84384db65bd73fca";
+          sha256 = "0y9k91gabgab7fwml4grhna2vzfwbxl9l1n58f5nl9xhia6zfqzi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -54323,6 +56473,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "lispyscript-mode";
+        ename = "lispyscript-mode";
         version = "20170720.1217";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -54351,6 +56502,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "lispyville";
+        ename = "lispyville";
         version = "20180704.458";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -54375,6 +56527,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "list-environment";
+        ename = "list-environment";
         version = "20151226.1856";
         src = fetchFromGitHub {
           owner = "dgtized";
@@ -54402,6 +56555,7 @@
                                      , s }:
       melpaBuild {
         pname = "list-packages-ext";
+        ename = "list-packages-ext";
         version = "20151115.916";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -54427,6 +56581,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "list-unicode-display";
+        ename = "list-unicode-display";
         version = "20150219.101";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -54451,6 +56606,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "list-utils";
+        ename = "list-utils";
         version = "20160414.702";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -54475,6 +56631,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lit-mode";
+        ename = "lit-mode";
         version = "20141123.936";
         src = fetchFromGitHub {
           owner = "HectorAE";
@@ -54500,6 +56657,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "litable";
+        ename = "litable";
         version = "20160922.859";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -54525,6 +56683,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "litecoin-ticker";
+        ename = "litecoin-ticker";
         version = "20160611.1711";
         src = fetchFromGitHub {
           owner = "llcc";
@@ -54551,6 +56710,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "literal-string";
+        ename = "literal-string";
         version = "20170301.730";
         src = fetchFromGitHub {
           owner = "joodie";
@@ -54576,6 +56736,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "literate-coffee-mode";
+        ename = "literate-coffee-mode";
         version = "20170211.715";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -54601,6 +56762,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "literate-starter-kit";
+        ename = "literate-starter-kit";
         version = "20150730.1154";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -54628,6 +56790,7 @@
                                    , narrowed-page-navigation }:
       melpaBuild {
         pname = "live-code-talks";
+        ename = "live-code-talks";
         version = "20150115.1423";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -54653,6 +56816,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "live-py-mode";
+        ename = "live-py-mode";
         version = "20180330.1758";
         src = fetchFromGitHub {
           owner = "donkirkby";
@@ -54677,6 +56841,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "lively";
+        ename = "lively";
         version = "20171005.54";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -54703,6 +56868,7 @@
                               , websocket }:
       melpaBuild {
         pname = "livereload";
+        ename = "livereload";
         version = "20170628.2350";
         src = fetchFromGitHub {
           owner = "joaotavora";
@@ -54727,6 +56893,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "livescript-mode";
+        ename = "livescript-mode";
         version = "20140612.2121";
         src = fetchFromGitHub {
           owner = "yhisamatsu";
@@ -54753,6 +56920,7 @@
                               , skewer-mode }:
       melpaBuild {
         pname = "livid-mode";
+        ename = "livid-mode";
         version = "20131116.544";
         src = fetchFromGitHub {
           owner = "pandeiro";
@@ -54778,6 +56946,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "lms";
+        ename = "lms";
         version = "20170804.922";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/lms.el";
@@ -54802,6 +56971,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "load-env-vars";
+        ename = "load-env-vars";
         version = "20180511.1510";
         src = fetchFromGitHub {
           owner = "diasjorge";
@@ -54826,6 +56996,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "load-relative";
+        ename = "load-relative";
         version = "20170526.310";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -54850,6 +57021,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "load-theme-buffer-local";
+        ename = "load-theme-buffer-local";
         version = "20120702.1336";
         src = fetchFromGitHub {
           owner = "vic";
@@ -54874,6 +57046,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "loc-changes";
+        ename = "loc-changes";
         version = "20160801.1008";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -54899,6 +57072,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "loccur";
+        ename = "loccur";
         version = "20161227.251";
         src = fetchFromGitHub {
           owner = "fourier";
@@ -54923,6 +57097,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "lockfile-mode";
+        ename = "lockfile-mode";
         version = "20170624.2207";
         src = fetchFromGitHub {
           owner = "preetpalS";
@@ -54947,6 +57122,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "lodgeit";
+        ename = "lodgeit";
         version = "20150312.649";
         src = fetchFromGitHub {
           owner = "ionrock";
@@ -54971,6 +57147,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "log4e";
+        ename = "log4e";
         version = "20170401.604";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -54995,6 +57172,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "log4j-mode";
+        ename = "log4j-mode";
         version = "20160108.1118";
         src = fetchgit {
           url = "https://git.code.sf.net/p/log4j-mode/code";
@@ -55021,6 +57199,7 @@
                               , stem }:
       melpaBuild {
         pname = "logalimacs";
+        ename = "logalimacs";
         version = "20131021.1129";
         src = fetchFromGitHub {
           owner = "logaling";
@@ -55046,6 +57225,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "logito";
+        ename = "logito";
         version = "20120225.1255";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -55071,6 +57251,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "lognav-mode";
+        ename = "lognav-mode";
         version = "20180708.322";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/lognav-mode";
@@ -55094,6 +57275,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "logpad";
+        ename = "logpad";
         version = "20180607.1215";
         src = fetchhg {
           url = "https://bitbucket.com/tux_/logpad.el";
@@ -55117,6 +57299,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "logstash-conf";
+        ename = "logstash-conf";
         version = "20170524.1229";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -55143,6 +57326,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "logview";
+        ename = "logview";
         version = "20180522.1054";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -55167,6 +57351,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "lolcode-mode";
+        ename = "lolcode-mode";
         version = "20111002.147";
         src = fetchFromGitHub {
           owner = "bodil";
@@ -55192,6 +57377,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "look-dired";
+        ename = "look-dired";
         version = "20160729.1623";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -55216,6 +57402,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "look-mode";
+        ename = "look-mode";
         version = "20151211.1026";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -55240,6 +57427,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "loop";
+        ename = "loop";
         version = "20160813.707";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -55264,6 +57452,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "lorem-ipsum";
+        ename = "lorem-ipsum";
         version = "20140911.1408";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -55289,6 +57478,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "love-minor-mode";
+        ename = "love-minor-mode";
         version = "20170726.2236";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -55314,6 +57504,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "lsp-go";
+        ename = "lsp-go";
         version = "20180630.1101";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55339,6 +57530,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-hack";
+        ename = "lsp-hack";
         version = "20180703.1837";
         src = fetchFromGitHub {
           owner = "jra3";
@@ -55365,6 +57557,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "lsp-haskell";
+        ename = "lsp-haskell";
         version = "20180131.459";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55390,6 +57583,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-html";
+        ename = "lsp-html";
         version = "20180629.25";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55416,6 +57610,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "lsp-intellij";
+        ename = "lsp-intellij";
         version = "20180621.1131";
         src = fetchFromGitHub {
           owner = "Ruin0x11";
@@ -55442,6 +57637,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-java";
+        ename = "lsp-java";
         version = "20180701.111";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55469,6 +57665,7 @@
                                 , s }:
       melpaBuild {
         pname = "lsp-javacomp";
+        ename = "lsp-javacomp";
         version = "20180218.2334";
         src = fetchFromGitHub {
           owner = "tigersoldier";
@@ -55495,6 +57692,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "lsp-javascript-flow";
+        ename = "lsp-javascript-flow";
         version = "20180612.2208";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55522,6 +57720,7 @@
                                              , typescript-mode }:
       melpaBuild {
         pname = "lsp-javascript-typescript";
+        ename = "lsp-javascript-typescript";
         version = "20180614.1311";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55547,6 +57746,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-mode";
+        ename = "lsp-mode";
         version = "20180708.1914";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55573,6 +57773,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "lsp-ocaml";
+        ename = "lsp-ocaml";
         version = "20180610.1154";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55599,6 +57800,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "lsp-php";
+        ename = "lsp-php";
         version = "20180331.944";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55624,6 +57826,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "lsp-python";
+        ename = "lsp-python";
         version = "20180609.16";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55653,6 +57856,7 @@
                             , rust-mode }:
       melpaBuild {
         pname = "lsp-rust";
+        ename = "lsp-rust";
         version = "20180305.508";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55680,6 +57884,7 @@
                                   , typescript-mode }:
       melpaBuild {
         pname = "lsp-typescript";
+        ename = "lsp-typescript";
         version = "20180614.1311";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55710,6 +57915,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "lsp-ui";
+        ename = "lsp-ui";
         version = "20180618.1951";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55743,6 +57949,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "lsp-vue";
+        ename = "lsp-vue";
         version = "20180628.15";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -55767,6 +57974,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lua-mode";
+        ename = "lua-mode";
         version = "20180323.321";
         src = fetchFromGitHub {
           owner = "immerrr";
@@ -55793,6 +58001,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "luarocks";
+        ename = "luarocks";
         version = "20170430.1605";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -55818,6 +58027,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "lush-theme";
+        ename = "lush-theme";
         version = "20141107.806";
         src = fetchFromGitHub {
           owner = "andre-richter";
@@ -55842,6 +58052,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "lusty-explorer";
+        ename = "lusty-explorer";
         version = "20180628.646";
         src = fetchFromGitHub {
           owner = "sjbach";
@@ -55866,6 +58077,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "lv";
+        ename = "lv";
         version = "20160912.756";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -55890,6 +58102,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "lxc";
+        ename = "lxc";
         version = "20140410.1322";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -55916,6 +58129,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "lxc-tramp";
+        ename = "lxc-tramp";
         version = "20180523.1324";
         src = fetchFromGitHub {
           owner = "montag451";
@@ -55942,6 +58156,7 @@
                           , seq }:
       melpaBuild {
         pname = "lyrics";
+        ename = "lyrics";
         version = "20180123.2004";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -55967,6 +58182,7 @@
                             , seq }:
       melpaBuild {
         pname = "m-buffer";
+        ename = "m-buffer";
         version = "20170407.1441";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -55992,6 +58208,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "mac-pseudo-daemon";
+        ename = "mac-pseudo-daemon";
         version = "20170728.1240";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -56019,6 +58236,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "maces-game";
+        ename = "maces-game";
         version = "20170903.851";
         src = fetchFromGitHub {
           owner = "pawelbx";
@@ -56043,6 +58261,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "macro-math";
+        ename = "macro-math";
         version = "20130328.904";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -56068,6 +58287,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "macrostep";
+        ename = "macrostep";
         version = "20161120.1306";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -56093,6 +58313,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "madhat2r-theme";
+        ename = "madhat2r-theme";
         version = "20170202.1630";
         src = fetchFromGitHub {
           owner = "madhat2r";
@@ -56118,6 +58339,7 @@
                             , splitter }:
       melpaBuild {
         pname = "mag-menu";
+        ename = "mag-menu";
         version = "20150505.1150";
         src = fetchFromGitHub {
           owner = "chumpage";
@@ -56144,6 +58366,7 @@
                                   , s }:
       melpaBuild {
         pname = "magic-filetype";
+        ename = "magic-filetype";
         version = "20180219.752";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -56170,6 +58393,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "magic-latex-buffer";
+        ename = "magic-latex-buffer";
         version = "20170530.1705";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -56201,12 +58425,13 @@
                          , with-editor }:
       melpaBuild {
         pname = "magit";
-        version = "20180714.1858";
+        ename = "magit";
+        version = "20180720.1712";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "9b948af9f5a2bbfddd48ba0eda79359e63ff9ef4";
-          sha256 = "16llfy8nvhxfh4wffnmvad4px5jbi426m1gr423igy2a8brgib0a";
+          rev = "c5269547ae178f4893a8ec662f71b0e032d4c0fa";
+          sha256 = "1qyyi1pyb1hr66b43ka0sshafizddxgzlbqlnlfncb2rm8fyab0h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
@@ -56235,12 +58460,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-annex";
-        version = "20180710.1954";
+        ename = "magit-annex";
+        version = "20180715.1812";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "57c3cb6f3ec86979084233be69eb87e3dcd21845";
-          sha256 = "0219hncp4vz3lvswy6c1cd8mpakrnbzcwzywjciv37ngph772mc5";
+          rev = "e36674fa052431342942ce42c3e396318a5bb5b0";
+          sha256 = "085qwg8f68j6lcdfm0ri6a8fjvb2z7qwkvaflcff7rr7hjbmnb29";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -56261,6 +58487,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "magit-filenotify";
+        ename = "magit-filenotify";
         version = "20151116.1540";
         src = fetchFromGitHub {
           owner = "ruediger";
@@ -56287,6 +58514,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "magit-find-file";
+        ename = "magit-find-file";
         version = "20150702.130";
         src = fetchFromGitHub {
           owner = "bradwright";
@@ -56312,6 +58540,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-gerrit";
+        ename = "magit-gerrit";
         version = "20160226.130";
         src = fetchFromGitHub {
           owner = "terranpro";
@@ -56341,12 +58570,13 @@
                                   , s }:
       melpaBuild {
         pname = "magit-gh-pulls";
-        version = "20171117.226";
+        ename = "magit-gh-pulls";
+        version = "20180716.936";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "magit-gh-pulls";
-          rev = "d526f4c9ee1709c79f8a4630699ce1f25ae054e7";
-          sha256 = "11fd3c7wnqy08khj6za8spbsm3k1rqqih21lbax2iwvxl8jv4dv0";
+          rev = "6949e973f3e951cb0bfe75d889e0fcccc33ba733";
+          sha256 = "0djr5lkv2wjs2c4dvb41xjkpjk9w6q888r4dlgw9w35z7h30b5vi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b54fe4f51820c2f707e1f5d8a1128fff19a319c/recipes/magit-gh-pulls";
@@ -56367,6 +58597,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "magit-gitflow";
+        ename = "magit-gitflow";
         version = "20170929.124";
         src = fetchFromGitHub {
           owner = "jtatarik";
@@ -56393,6 +58624,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-imerge";
+        ename = "magit-imerge";
         version = "20180609.858";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56420,6 +58652,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "magit-lfs";
+        ename = "magit-lfs";
         version = "20170312.1524";
         src = fetchFromGitHub {
           owner = "ailrun";
@@ -56446,6 +58679,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "magit-org-todos";
+        ename = "magit-org-todos";
         version = "20180709.1250";
         src = fetchFromGitHub {
           owner = "danielma";
@@ -56474,6 +58708,7 @@
                             , p4 }:
       melpaBuild {
         pname = "magit-p4";
+        ename = "magit-p4";
         version = "20170414.546";
         src = fetchFromGitHub {
           owner = "qoocku";
@@ -56501,6 +58736,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-popup";
+        ename = "magit-popup";
         version = "20180618.1602";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56527,6 +58763,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-stgit";
+        ename = "magit-stgit";
         version = "20180522.542";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56553,6 +58790,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "magit-svn";
+        ename = "magit-svn";
         version = "20170213.433";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56579,6 +58817,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-tbdiff";
+        ename = "magit-tbdiff";
         version = "20180527.652";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56613,12 +58852,13 @@
                                , s }:
       melpaBuild {
         pname = "magit-todos";
-        version = "20180714.1242";
+        ename = "magit-todos";
+        version = "20180716.2339";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "204e163d941dcc3b89db8a462d73e3c69e8e83bc";
-          sha256 = "1v78rzgk9s3ww97smqryyr3f2np5zwxx0j7v79rwmy49ck2n3cvq";
+          rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63";
+          sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
@@ -56650,6 +58890,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-topgit";
+        ename = "magit-topgit";
         version = "20160313.1254";
         src = fetchFromGitHub {
           owner = "magit";
@@ -56680,6 +58921,7 @@
                             , s }:
       melpaBuild {
         pname = "magithub";
+        ename = "magithub";
         version = "20180625.2104";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -56707,6 +58949,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "magma-mode";
+        ename = "magma-mode";
         version = "20180413.727";
         src = fetchFromGitHub {
           owner = "ThibautVerron";
@@ -56733,6 +58976,7 @@
                              , s }:
       melpaBuild {
         pname = "magnatune";
+        ename = "magnatune";
         version = "20151030.1235";
         src = fetchFromGitHub {
           owner = "eikek";
@@ -56757,6 +59001,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "majapahit-theme";
+        ename = "majapahit-theme";
         version = "20160817.1148";
         src = fetchFromGitLab {
           owner = "franksn";
@@ -56784,6 +59029,7 @@
                                     , powerline }:
       melpaBuild {
         pname = "major-mode-icons";
+        ename = "major-mode-icons";
         version = "20170228.2314";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -56808,6 +59054,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "make-color";
+        ename = "make-color";
         version = "20140625.450";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -56834,6 +59081,7 @@
                               , swiper }:
       melpaBuild {
         pname = "make-it-so";
+        ename = "make-it-so";
         version = "20180128.1307";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -56862,12 +59110,13 @@
                                      , s }:
       melpaBuild {
         pname = "makefile-executor";
-        version = "20180410.30";
+        ename = "makefile-executor";
+        version = "20180720.132";
         src = fetchFromGitHub {
           owner = "thiderman";
           repo = "makefile-executor.el";
-          rev = "054c5460616d1903499d49190ac79074e9bd1c52";
-          sha256 = "0axqm8hd2hz1a4qh02p7kyvrb0mab8iswpypij3q05s5yxidv1vv";
+          rev = "9a7d78f814a4b372d8f8179819cb1b37b83b1973";
+          sha256 = "1sw8zqxzrcxs4v211bmlxz5xfrpckrawnbhf1fiji0971cv3hx0r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -56887,6 +59136,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "makey";
+        ename = "makey";
         version = "20131231.630";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -56917,6 +59167,7 @@
                            , s }:
       melpaBuild {
         pname = "malinka";
+        ename = "malinka";
         version = "20171202.221";
         src = fetchFromGitHub {
           owner = "LefterisJP";
@@ -56941,6 +59192,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mallard-mode";
+        ename = "mallard-mode";
         version = "20131203.2025";
         src = fetchFromGitHub {
           owner = "jhradilek";
@@ -56967,6 +59219,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "mallard-snippets";
+        ename = "mallard-snippets";
         version = "20131023.1151";
         src = fetchFromGitHub {
           owner = "jhradilek";
@@ -56992,6 +59245,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "malyon";
+        ename = "malyon";
         version = "20161208.1325";
         src = fetchFromGitHub {
           owner = "speedenator";
@@ -57017,6 +59271,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "man-commands";
+        ename = "man-commands";
         version = "20151221.1421";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -57042,6 +59297,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "manage-minor-mode";
+        ename = "manage-minor-mode";
         version = "20140310.900";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -57066,6 +59322,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "mandm-theme";
+        ename = "mandm-theme";
         version = "20170925.321";
         src = fetchFromGitHub {
           owner = "choppsv1";
@@ -57094,6 +59351,7 @@
                            , org }:
       melpaBuild {
         pname = "mandoku";
+        ename = "mandoku";
         version = "20180403.406";
         src = fetchFromGitHub {
           owner = "mandoku";
@@ -57125,6 +59383,7 @@
                                , org }:
       melpaBuild {
         pname = "mandoku-tls";
+        ename = "mandoku-tls";
         version = "20171117.1840";
         src = fetchFromGitHub {
           owner = "mandoku";
@@ -57157,6 +59416,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "map-progress";
+        ename = "map-progress";
         version = "20140310.1432";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -57182,6 +59442,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "map-regexp";
+        ename = "map-regexp";
         version = "20130522.1403";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -57210,6 +59471,7 @@
                              , s }:
       melpaBuild {
         pname = "marcopolo";
+        ename = "marcopolo";
         version = "20160421.304";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -57234,6 +59496,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mark-multiple";
+        ename = "mark-multiple";
         version = "20121118.754";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -57258,6 +59521,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "mark-tools";
+        ename = "mark-tools";
         version = "20130614.325";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -57284,6 +59548,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "markdown-mode";
+        ename = "markdown-mode";
         version = "20180707.555";
         src = fetchFromGitHub {
           owner = "jrblevin";
@@ -57309,6 +59574,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "markdown-mode-plus";
+        ename = "markdown-mode+";
         version = "20170320.1404";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -57334,6 +59600,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "markdown-preview-eww";
+        ename = "markdown-preview-eww";
         version = "20160111.702";
         src = fetchFromGitHub {
           owner = "niku";
@@ -57364,6 +59631,7 @@
                                          , websocket }:
       melpaBuild {
         pname = "markdown-preview-mode";
+        ename = "markdown-preview-mode";
         version = "20171121.2323";
         src = fetchFromGitHub {
           owner = "ancane";
@@ -57398,6 +59666,7 @@
                                 , s }:
       melpaBuild {
         pname = "markdown-toc";
+        ename = "markdown-toc";
         version = "20170711.1249";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -57423,6 +59692,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "markdownfmt";
+        ename = "markdownfmt";
         version = "20160609.541";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -57448,6 +59718,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "markup";
+        ename = "markup";
         version = "20170420.429";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -57472,6 +59743,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "markup-faces";
+        ename = "markup-faces";
         version = "20141110.17";
         src = fetchFromGitHub {
           owner = "sensorflo";
@@ -57499,6 +59771,7 @@
                                     , web }:
       melpaBuild {
         pname = "marmalade-client";
+        ename = "marmalade-client";
         version = "20141231.1207";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -57526,6 +59799,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "marshal";
+        ename = "marshal";
         version = "20180124.439";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -57551,6 +59825,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "maruo-macro-mode";
+        ename = "maruo-macro-mode";
         version = "20160616.649";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -57576,6 +59851,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "mastodon";
+        ename = "mastodon";
         version = "20180305.1909";
         src = fetchFromGitHub {
           owner = "jdenen";
@@ -57601,6 +59877,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "material-theme";
+        ename = "material-theme";
         version = "20171123.1040";
         src = fetchFromGitHub {
           owner = "cpaulik";
@@ -57625,6 +59902,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "math-symbol-lists";
+        ename = "math-symbol-lists";
         version = "20170221.553";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -57650,6 +59928,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "math-symbols";
+        ename = "math-symbols";
         version = "20170818.759";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -57674,6 +59953,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "matlab-mode";
+        ename = "matlab-mode";
         version = "20180125.1010";
         src = fetchgit {
           url = "https://git.code.sf.net/p/matlab-emacs/src";
@@ -57697,6 +59977,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "maude-mode";
+        ename = "maude-mode";
         version = "20160222.807";
         src = fetchFromGitHub {
           owner = "rudi";
@@ -57723,6 +60004,7 @@
                                    , s }:
       melpaBuild {
         pname = "maven-test-mode";
+        ename = "maven-test-mode";
         version = "20141219.2157";
         src = fetchFromGitHub {
           owner = "rranelli";
@@ -57747,6 +60029,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "maxframe";
+        ename = "maxframe";
         version = "20170120.905";
         src = fetchFromGitHub {
           owner = "rmm5t";
@@ -57772,6 +60055,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mb-url";
+        ename = "mb-url";
         version = "20161224.1806";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -57798,6 +60082,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mbe";
+        ename = "mbe";
         version = "20151126.334";
         src = fetchFromGitHub {
           owner = "ijp";
@@ -57823,6 +60108,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mbo70s-theme";
+        ename = "mbo70s-theme";
         version = "20170808.615";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -57847,6 +60133,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mbsync";
+        ename = "mbsync";
         version = "20180530.33";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -57872,6 +60159,7 @@
                              , multiple-cursors }:
       melpaBuild {
         pname = "mc-extras";
+        ename = "mc-extras";
         version = "20180519.2139";
         src = fetchFromGitHub {
           owner = "knu";
@@ -57896,6 +60184,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "md-readme";
+        ename = "md-readme";
         version = "20160811.946";
         src = fetchFromGitHub {
           owner = "thomas11";
@@ -57927,6 +60216,7 @@
                          , tree-mode }:
       melpaBuild {
         pname = "md4rd";
+        ename = "md4rd";
         version = "20180625.2236";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -57951,6 +60241,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mediawiki";
+        ename = "mediawiki";
         version = "20170812.2255";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -57979,12 +60270,13 @@
                              , yasnippet }:
       melpaBuild {
         pname = "meghanada";
-        version = "20180620.1649";
+        ename = "meghanada";
+        version = "20180717.1810";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "f55a237e10fac1f06b50a41c54236ed9fc197530";
-          sha256 = "17shp56xg47sfp9l1iak5dscr62yj9i55xwnfn380x24pxrsfp88";
+          rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c";
+          sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -58003,6 +60295,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "melancholy-theme";
+        ename = "melancholy-theme";
         version = "20170220.1248";
         src = fetchFromGitHub {
           owner = "techquila";
@@ -58028,6 +60321,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mellow-theme";
+        ename = "mellow-theme";
         version = "20170808.617";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -58053,6 +60347,7 @@
                                         , s }:
       melpaBuild {
         pname = "melpa-upstream-visit";
+        ename = "melpa-upstream-visit";
         version = "20130720.333";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -58077,6 +60372,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "memoize";
+        ename = "memoize";
         version = "20180614.1230";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -58103,6 +60399,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "memolist";
+        ename = "memolist";
         version = "20150804.1021";
         src = fetchFromGitHub {
           owner = "mikanfactory";
@@ -58130,6 +60427,7 @@
                           , xml-rpc }:
       melpaBuild {
         pname = "mentor";
+        ename = "mentor";
         version = "20170105.221";
         src = fetchFromGitHub {
           owner = "skangas";
@@ -58154,6 +60452,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "merlin";
+        ename = "merlin";
         version = "20180214.242";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
@@ -58180,6 +60479,7 @@
                                 , merlin }:
       melpaBuild {
         pname = "merlin-eldoc";
+        ename = "merlin-eldoc";
         version = "20180630.1026";
         src = fetchFromGitHub {
           owner = "khady";
@@ -58205,6 +60505,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "meson-mode";
+        ename = "meson-mode";
         version = "20170901.1135";
         src = fetchFromGitHub {
           owner = "wentasah";
@@ -58229,6 +60530,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "messages-are-flowing";
+        ename = "messages-are-flowing";
         version = "20170218.1720";
         src = fetchFromGitHub {
           owner = "legoscia";
@@ -58253,6 +60555,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "meta-presenter";
+        ename = "meta-presenter";
         version = "20170425.1934";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -58278,6 +60581,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "metalheart-theme";
+        ename = "metalheart-theme";
         version = "20160709.2341";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -58303,6 +60607,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "metascript-mode";
+        ename = "metascript-mode";
         version = "20150708.1757";
         src = fetchFromGitHub {
           owner = "metascript";
@@ -58328,6 +60633,7 @@
                               , xml-rpc }:
       melpaBuild {
         pname = "metaweblog";
+        ename = "metaweblog";
         version = "20171216.1840";
         src = fetchFromGitHub {
           owner = "punchagan";
@@ -58352,6 +60658,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mew";
+        ename = "mew";
         version = "20180709.1817";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
@@ -58376,6 +60683,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "mexican-holidays";
+        ename = "mexican-holidays";
         version = "20160109.1342";
         src = fetchFromGitHub {
           owner = "shopClerk";
@@ -58401,6 +60709,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "mgmtconfig-mode";
+        ename = "mgmtconfig-mode";
         version = "20180222.1257";
         src = fetchFromGitHub {
           owner = "purpleidea";
@@ -58426,12 +60735,13 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mhc";
-        version = "20180519.2027";
+        ename = "mhc";
+        version = "20180717.2009";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "63031a79b5ad759c6e4e2c30288dce1caa12f7e5";
-          sha256 = "0g4na6zwpj0p94v5fv1yca57i2hmx1lg5p6ps22qj58jrxffvnms";
+          rev = "e29e69ab2f282131039a63f56f48e39d56c175d9";
+          sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -58450,6 +60760,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mic-paren";
+        ename = "mic-paren";
         version = "20170731.1207";
         src = fetchFromGitHub {
           owner = "emacsattic";
@@ -58476,6 +60787,7 @@
                              , powerline }:
       melpaBuild {
         pname = "micgoline";
+        ename = "micgoline";
         version = "20160414.2026";
         src = fetchFromGitHub {
           owner = "yzprofile";
@@ -58502,6 +60814,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "midje-mode";
+        ename = "midje-mode";
         version = "20170808.2103";
         src = fetchFromGitHub {
           owner = "dnaumov";
@@ -58527,6 +60840,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "migemo";
+        ename = "migemo";
         version = "20160924.741";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -58551,6 +60865,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "milkode";
+        ename = "milkode";
         version = "20140926.2229";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -58575,6 +60890,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "minesweeper";
+        ename = "minesweeper";
         version = "20150413.2222";
         src = fetchhg {
           url = "https://bitbucket.com/zck/minesweeper.el";
@@ -58599,6 +60915,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mingus";
+        ename = "mingus";
         version = "20180712.2336";
         src = fetchFromGitHub {
           owner = "pft";
@@ -58624,6 +60941,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "mini-header-line";
+        ename = "mini-header-line";
         version = "20170621.521";
         src = fetchFromGitHub {
           owner = "ksjogo";
@@ -58648,6 +60966,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "minibuf-isearch";
+        ename = "minibuf-isearch";
         version = "20151226.1143";
         src = fetchFromGitHub {
           owner = "knagano";
@@ -58672,6 +60991,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "minibuffer-complete-cycle";
+        ename = "minibuffer-complete-cycle";
         version = "20130813.945";
         src = fetchFromGitHub {
           owner = "knu";
@@ -58696,6 +61016,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "minibuffer-cua";
+        ename = "minibuffer-cua";
         version = "20130906.434";
         src = fetchFromGitHub {
           owner = "knu";
@@ -58720,6 +61041,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "miniedit";
+        ename = "miniedit";
         version = "20100419.1045";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -58744,6 +61066,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "minimal-session-saver";
+        ename = "minimal-session-saver";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -58768,6 +61091,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "minimal-theme";
+        ename = "minimal-theme";
         version = "20160608.322";
         src = fetchFromGitHub {
           owner = "anler";
@@ -58794,6 +61118,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "minions";
+        ename = "minions";
         version = "20180709.1012";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -58819,6 +61144,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "minitest";
+        ename = "minitest";
         version = "20160628.1120";
         src = fetchFromGitHub {
           owner = "arthurnn";
@@ -58844,6 +61170,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "minizinc-mode";
+        ename = "minizinc-mode";
         version = "20180201.650";
         src = fetchFromGitHub {
           owner = "m00nlight";
@@ -58868,6 +61195,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "minor-mode-hack";
+        ename = "minor-mode-hack";
         version = "20170925.1734";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -58892,6 +61220,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "mip-mode";
+        ename = "mip-mode";
         version = "20151126.2217";
         src = fetchFromGitLab {
           owner = "gaudecker";
@@ -58916,6 +61245,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mips-mode";
+        ename = "mips-mode";
         version = "20180502.757";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -58941,6 +61271,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "mixed-pitch";
+        ename = "mixed-pitch";
         version = "20180410.917";
         src = fetchFromGitLab {
           owner = "jabranham";
@@ -58966,6 +61297,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mkdown";
+        ename = "mkdown";
         version = "20140517.718";
         src = fetchFromGitHub {
           owner = "ajtulloch";
@@ -58991,6 +61323,7 @@
                               , mmm-mode }:
       melpaBuild {
         pname = "mmm-jinja2";
+        ename = "mmm-jinja2";
         version = "20170313.720";
         src = fetchFromGitHub {
           owner = "glynnforrest";
@@ -59016,6 +61349,7 @@
                             , mmm-mode }:
       melpaBuild {
         pname = "mmm-mako";
+        ename = "mmm-mako";
         version = "20121019.2351";
         src = fetchhg {
           url = "https://bitbucket.com/pjenvey/mmm-mako";
@@ -59041,6 +61375,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mmt";
+        ename = "mmt";
         version = "20171231.2219";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -59065,6 +61400,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mo-git-blame";
+        ename = "mo-git-blame";
         version = "20160129.959";
         src = fetchFromGitLab {
           owner = "mbunkus";
@@ -59089,6 +61425,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "mo-vi-ment-mode";
+        ename = "mo-vi-ment-mode";
         version = "20131028.2333";
         src = fetchFromGitHub {
           owner = "AjayMT";
@@ -59115,6 +61452,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mobdebug-mode";
+        ename = "mobdebug-mode";
         version = "20140109.1946";
         src = fetchFromGitHub {
           owner = "deftsp";
@@ -59141,6 +61479,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mocha";
+        ename = "mocha";
         version = "20180321.1622";
         src = fetchFromGitHub {
           owner = "scottaj";
@@ -59166,6 +61505,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "mocha-snippets";
+        ename = "mocha-snippets";
         version = "20170103.2127";
         src = fetchFromGitHub {
           owner = "cowboyd";
@@ -59192,6 +61532,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mocker";
+        ename = "mocker";
         version = "20150916.1854";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -59217,6 +61558,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "modalka";
+        ename = "modalka";
         version = "20171231.2213";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -59243,6 +61585,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "mode-icons";
+        ename = "mode-icons";
         version = "20170216.620";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -59267,6 +61610,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "mode-line-bell";
+        ename = "mode-line-bell";
         version = "20171231.1939";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -59291,6 +61635,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "mode-line-debug";
+        ename = "mode-line-debug";
         version = "20180318.1525";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -59315,6 +61660,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "modern-cpp-font-lock";
+        ename = "modern-cpp-font-lock";
         version = "20180110.1231";
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
@@ -59339,6 +61685,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "modtime-skip-mode";
+        ename = "modtime-skip-mode";
         version = "20140128.1401";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
@@ -59363,6 +61710,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "moe-theme";
+        ename = "moe-theme";
         version = "20180616.1900";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -59388,6 +61736,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "molecule";
+        ename = "molecule";
         version = "20180527.43";
         src = fetchgit {
           url = "https://git.daemons.it/drymer/molecule.el/";
@@ -59411,6 +61760,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "molokai-theme";
+        ename = "molokai-theme";
         version = "20151016.845";
         src = fetchFromGitHub {
           owner = "alloy-d";
@@ -59435,6 +61785,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mongo";
+        ename = "mongo";
         version = "20150315.519";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -59460,6 +61811,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "monitor";
+        ename = "monitor";
         version = "20161018.444";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -59484,12 +61836,13 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "monky";
-        version = "20180627.831";
+        ename = "monky";
+        version = "20180716.720";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "141e8a8098d94039cdce8900469866b307cee5bf";
-          sha256 = "0zpmbbifb8mapagzwmhni4hdf3zcv93lav60i0rnk7vq20h66ps2";
+          rev = "f1aaea2b8334d5870c8179f2c70b4088882caff8";
+          sha256 = "1ibfigbkir4y87wl7nhz6z5fb13gqmhiby1315yqw8p7d604am56";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -59508,6 +61861,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "monochrome-theme";
+        ename = "monochrome-theme";
         version = "20140326.350";
         src = fetchFromGitHub {
           owner = "fxn";
@@ -59533,6 +61887,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "monokai-alt-theme";
+        ename = "monokai-alt-theme";
         version = "20170630.1348";
         src = fetchFromGitHub {
           owner = "dawidof";
@@ -59557,6 +61912,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "monokai-theme";
+        ename = "monokai-theme";
         version = "20180402.221";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
@@ -59582,6 +61938,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "monotropic-theme";
+        ename = "monotropic-theme";
         version = "20180218.357";
         src = fetchFromGitHub {
           owner = "caffo";
@@ -59606,6 +61963,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "monroe";
+        ename = "monroe";
         version = "20180703.1046";
         src = fetchFromGitHub {
           owner = "sanel";
@@ -59631,6 +61989,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "moody";
+        ename = "moody";
         version = "20180403.549";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -59656,6 +62015,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "moom";
+        ename = "moom";
         version = "20180618.1245";
         src = fetchFromGitHub {
           owner = "takaxp";
@@ -59682,6 +62042,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "moonscript";
+        ename = "moonscript";
         version = "20170831.1526";
         src = fetchFromGitHub {
           owner = "k2052";
@@ -59707,6 +62068,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "morganey-mode";
+        ename = "morganey-mode";
         version = "20170118.134";
         src = fetchFromGitHub {
           owner = "morganey-lang";
@@ -59731,6 +62093,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "morlock";
+        ename = "morlock";
         version = "20180318.1323";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -59756,6 +62119,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mosey";
+        ename = "mosey";
         version = "20180614.949";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -59781,6 +62145,7 @@
                              , ruby-mode ? null }:
       melpaBuild {
         pname = "mote-mode";
+        ename = "mote-mode";
         version = "20160122.1629";
         src = fetchFromGitHub {
           owner = "inkel";
@@ -59807,6 +62172,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "motion-mode";
+        ename = "motion-mode";
         version = "20140919.1856";
         src = fetchFromGitHub {
           owner = "ainame";
@@ -59833,6 +62199,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "mouse-slider-mode";
+        ename = "mouse-slider-mode";
         version = "20161021.1214";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -59857,6 +62224,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "move-dup";
+        ename = "move-dup";
         version = "20180531.537";
         src = fetchFromGitHub {
           owner = "wyuenho";
@@ -59881,6 +62249,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "move-text";
+        ename = "move-text";
         version = "20170908.2030";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -59905,6 +62274,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mowedline";
+        ename = "mowedline";
         version = "20161121.1835";
         src = fetchFromGitHub {
           owner = "retroj";
@@ -59929,6 +62299,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "moz";
+        ename = "moz";
         version = "20150805.1006";
         src = fetchFromGitHub {
           owner = "bard";
@@ -59954,6 +62325,7 @@
                                   , moz }:
       melpaBuild {
         pname = "moz-controller";
+        ename = "moz-controller";
         version = "20151208.1806";
         src = fetchFromGitHub {
           owner = "RenWenshan";
@@ -59978,6 +62350,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "mozc";
+        ename = "mozc";
         version = "20180101.0";
         src = fetchFromGitHub {
           owner = "google";
@@ -60003,6 +62376,7 @@
                            , mozc }:
       melpaBuild {
         pname = "mozc-im";
+        ename = "mozc-im";
         version = "20160411.1722";
         src = fetchFromGitHub {
           owner = "d5884";
@@ -60029,6 +62403,7 @@
                               , popup }:
       melpaBuild {
         pname = "mozc-popup";
+        ename = "mozc-popup";
         version = "20150223.1634";
         src = fetchFromGitHub {
           owner = "d5884";
@@ -60056,6 +62431,7 @@
                              , mozc }:
       melpaBuild {
         pname = "mozc-temp";
+        ename = "mozc-temp";
         version = "20160228.40";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -60080,6 +62456,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mpages";
+        ename = "mpages";
         version = "20150710.704";
         src = fetchFromGitHub {
           owner = "slevin";
@@ -60106,6 +62483,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mpdel";
+        ename = "mpdel";
         version = "20180606.512";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -60132,6 +62510,7 @@
                               , queue }:
       melpaBuild {
         pname = "mpmc-queue";
+        ename = "mpmc-queue";
         version = "20180303.1229";
         src = fetchFromGitHub {
           owner = "smizoe";
@@ -60160,6 +62539,7 @@
                        , org }:
       melpaBuild {
         pname = "mpv";
+        ename = "mpv";
         version = "20180602.314";
         src = fetchFromGitHub {
           owner = "kljohann";
@@ -60185,6 +62565,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mqr";
+        ename = "mqr";
         version = "20180527.504";
         src = fetchFromGitHub {
           owner = "calancha";
@@ -60211,6 +62592,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mqtt-mode";
+        ename = "mqtt-mode";
         version = "20180605.1031";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -60239,6 +62621,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "msvc";
+        ename = "msvc";
         version = "20171225.738";
         src = fetchFromGitHub {
           owner = "yaruopooner";
@@ -60264,6 +62647,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mtg-deck-mode";
+        ename = "mtg-deck-mode";
         version = "20180613.1310";
         src = fetchFromGitHub {
           owner = "mattiasb";
@@ -60289,6 +62673,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "mu-cite";
+        ename = "mu-cite";
         version = "20160130.300";
         src = fetchFromGitHub {
           owner = "ksato9700";
@@ -60317,6 +62702,7 @@
                               , s }:
       melpaBuild {
         pname = "mu4e-alert";
+        ename = "mu4e-alert";
         version = "20180304.2246";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -60342,12 +62728,13 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "mu4e-conversation";
-        version = "20180711.251";
+        ename = "mu4e-conversation";
+        version = "20180722.159";
         src = fetchFromGitLab {
           owner = "ambrevar";
           repo = "mu4e-conversation";
-          rev = "6690d730aaf912b7a2f17caa1e18513c5ee3560e";
-          sha256 = "1nx9q0d1fk14hfwim456sb1gidmarislf1vlwdkp8mgh5rywxk1q";
+          rev = "223cc66e99c7665326e3d991d6d383cb0d7512bb";
+          sha256 = "1ncawxcgsnk6ila5h30ka66x350xnkpxadlpnszbf3lc3w2scxjp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa/recipes/mu4e-conversation";
@@ -60368,6 +62755,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "mu4e-jump-to-list";
+        ename = "mu4e-jump-to-list";
         version = "20180425.1132";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -60393,6 +62781,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "mu4e-maildirs-extension";
+        ename = "mu4e-maildirs-extension";
         version = "20180606.112";
         src = fetchFromGitHub {
           owner = "agpchil";
@@ -60418,6 +62807,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "mu4e-query-fragments";
+        ename = "mu4e-query-fragments";
         version = "20170923.622";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -60443,6 +62833,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "muban";
+        ename = "muban";
         version = "20180415.519";
         src = fetchFromGitHub {
           owner = "jiahaowork";
@@ -60468,6 +62859,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "multi";
+        ename = "multi";
         version = "20131013.844";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
@@ -60494,6 +62886,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "multi-compile";
+        ename = "multi-compile";
         version = "20160306.1423";
         src = fetchFromGitHub {
           owner = "ReanGD";
@@ -60523,6 +62916,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "multi-line";
+        ename = "multi-line";
         version = "20170821.1926";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -60548,6 +62942,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "multi-project";
+        ename = "multi-project";
         version = "20171217.1211";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
@@ -60573,6 +62968,7 @@
                              , window-layout }:
       melpaBuild {
         pname = "multi-run";
+        ename = "multi-run";
         version = "20180122.709";
         src = fetchFromGitHub {
           owner = "sagarjha";
@@ -60597,6 +62993,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "multi-term";
+        ename = "multi-term";
         version = "20160619.233";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -60621,6 +63018,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "multi-web-mode";
+        ename = "multi-web-mode";
         version = "20130823.2054";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -60645,6 +63043,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "multicolumn";
+        ename = "multicolumn";
         version = "20150202.1451";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -60669,6 +63068,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "multifiles";
+        ename = "multifiles";
         version = "20130615.1433";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -60694,6 +63094,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "multiple-cursors";
+        ename = "multiple-cursors";
         version = "20180615.518";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -60720,6 +63121,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "multitran";
+        ename = "multitran";
         version = "20180320.956";
         src = fetchFromGitHub {
           owner = "zevlg";
@@ -60747,6 +63149,7 @@
                             , s }:
       melpaBuild {
         pname = "mustache";
+        ename = "mustache";
         version = "20170923.533";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -60771,6 +63174,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mustache-mode";
+        ename = "mustache-mode";
         version = "20141024.732";
         src = fetchFromGitHub {
           owner = "mustache";
@@ -60795,6 +63199,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mustang-theme";
+        ename = "mustang-theme";
         version = "20170719.246";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -60820,6 +63225,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mustard-theme";
+        ename = "mustard-theme";
         version = "20170808.619";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -60846,6 +63252,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mutant";
+        ename = "mutant";
         version = "20160124.553";
         src = fetchFromGitHub {
           owner = "p-lambert";
@@ -60870,6 +63277,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mvn";
+        ename = "mvn";
         version = "20160211.743";
         src = fetchFromGitHub {
           owner = "apg";
@@ -60895,6 +63303,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mw-thesaurus";
+        ename = "mw-thesaurus";
         version = "20180628.2225";
         src = fetchFromGitHub {
           owner = "agzam";
@@ -60919,6 +63328,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "mwim";
+        ename = "mwim";
         version = "20180227.852";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -60944,6 +63354,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "mxf-view";
+        ename = "mxf-view";
         version = "20180501.40";
         src = fetchFromGitHub {
           owner = "t-suwa";
@@ -60968,6 +63379,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "myanmar-input-methods";
+        ename = "myanmar-input-methods";
         version = "20160106.737";
         src = fetchFromGitHub {
           owner = "yelinkyaw";
@@ -60994,6 +63406,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mykie";
+        ename = "mykie";
         version = "20150808.1505";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -61019,6 +63432,7 @@
                              , virtualenvwrapper }:
       melpaBuild {
         pname = "mynt-mode";
+        ename = "mynt-mode";
         version = "20150512.1349";
         src = fetchFromGitHub {
           owner = "crshd";
@@ -61045,6 +63459,7 @@
                                 , s }:
       melpaBuild {
         pname = "mysql-to-org";
+        ename = "mysql-to-org";
         version = "20180123.714";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -61069,6 +63484,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mysql2sqlite";
+        ename = "mysql2sqlite";
         version = "20170725.1516";
         src = fetchFromGitHub {
           owner = "echosa";
@@ -61095,6 +63511,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "myterminal-controls";
+        ename = "myterminal-controls";
         version = "20170425.1936";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -61121,6 +63538,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "n4js";
+        ename = "n4js";
         version = "20150713.1931";
         src = fetchFromGitHub {
           owner = "tmtxt";
@@ -61148,6 +63566,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "name-this-color";
+        ename = "name-this-color";
         version = "20151014.1330";
         src = fetchFromGitHub {
           owner = "knl";
@@ -61172,6 +63591,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nameframe";
+        ename = "nameframe";
         version = "20171106.1656";
         src = fetchFromGitHub {
           owner = "john2x";
@@ -61198,6 +63618,7 @@
                                          , perspective }:
       melpaBuild {
         pname = "nameframe-perspective";
+        ename = "nameframe-perspective";
         version = "20170405.1819";
         src = fetchFromGitHub {
           owner = "john2x";
@@ -61224,6 +63645,7 @@
                                         , projectile }:
       melpaBuild {
         pname = "nameframe-projectile";
+        ename = "nameframe-projectile";
         version = "20160927.2103";
         src = fetchFromGitHub {
           owner = "john2x";
@@ -61249,6 +63671,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nameless";
+        ename = "nameless";
         version = "20180215.1421";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -61275,6 +63698,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "names";
+        ename = "names";
         version = "20180321.455";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -61299,6 +63723,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "namespaces";
+        ename = "namespaces";
         version = "20130326.1550";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -61324,6 +63749,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "nand2tetris";
+        ename = "nand2tetris";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -61349,6 +63775,7 @@
                                          , nand2tetris }:
       melpaBuild {
         pname = "nand2tetris-assembler";
+        ename = "nand2tetris-assembler";
         version = "20171201.1013";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -61373,6 +63800,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nanowrimo";
+        ename = "nanowrimo";
         version = "20151104.1828";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/nanowrimo.el";
@@ -61396,6 +63824,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "naquadah-theme";
+        ename = "naquadah-theme";
         version = "20180212.440";
         src = fetchFromGitHub {
           owner = "jd";
@@ -61421,6 +63850,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "narrow-reindent";
+        ename = "narrow-reindent";
         version = "20150722.1206";
         src = fetchFromGitHub {
           owner = "emallson";
@@ -61447,6 +63877,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "narrowed-page-navigation";
+        ename = "narrowed-page-navigation";
         version = "20150108.2119";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -61471,6 +63902,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nash-mode";
+        ename = "nash-mode";
         version = "20160830.512";
         src = fetchFromGitHub {
           owner = "tiago4orion";
@@ -61496,6 +63928,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nasm-mode";
+        ename = "nasm-mode";
         version = "20180711.1209";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -61520,6 +63953,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "nav";
+        ename = "nav";
         version = "20120507.7";
         src = fetchFromGitHub {
           owner = "ijt";
@@ -61544,6 +63978,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nav-flash";
+        ename = "nav-flash";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -61570,6 +64005,7 @@
                              , outshine }:
       melpaBuild {
         pname = "navi-mode";
+        ename = "navi-mode";
         version = "20180515.1948";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -61594,6 +64030,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "navi2ch";
+        ename = "navi2ch";
         version = "20150329.1916";
         src = fetchFromGitHub {
           owner = "naota";
@@ -61621,6 +64058,7 @@
                             , s }:
       melpaBuild {
         pname = "navorski";
+        ename = "navorski";
         version = "20141203.1024";
         src = fetchFromGitHub {
           owner = "roman";
@@ -61646,6 +64084,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ncl-mode";
+        ename = "ncl-mode";
         version = "20180128.2303";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -61670,6 +64109,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "nclip";
+        ename = "nclip";
         version = "20130617.1315";
         src = fetchFromGitHub {
           owner = "maio";
@@ -61695,6 +64135,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "neato-graph-bar";
+        ename = "neato-graph-bar";
         version = "20171230.1753";
         src = fetchFromGitLab {
           owner = "RobertCochran";
@@ -61719,6 +64160,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "nemerle";
+        ename = "nemerle";
         version = "20161029.1323";
         src = fetchFromGitHub {
           owner = "rsdn";
@@ -61743,6 +64185,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "neon-mode";
+        ename = "neon-mode";
         version = "20180406.456";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -61768,6 +64211,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "neotree";
+        ename = "neotree";
         version = "20180616.903";
         src = fetchFromGitHub {
           owner = "jaypei";
@@ -61793,6 +64237,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "nerdtab";
+        ename = "nerdtab";
         version = "20180527.408";
         src = fetchFromGitHub {
           owner = "casouri";
@@ -61819,6 +64264,7 @@
                                  , names }:
       melpaBuild {
         pname = "netease-music";
+        ename = "netease-music";
         version = "20180429.1822";
         src = fetchFromGitHub {
           owner = "nicehiro";
@@ -61843,6 +64289,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "netherlands-holidays";
+        ename = "netherlands-holidays";
         version = "20150202.817";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -61870,6 +64317,7 @@
                              , popup }:
       melpaBuild {
         pname = "netrunner";
+        ename = "netrunner";
         version = "20160910.1632";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -61895,6 +64343,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "network-watch";
+        ename = "network-watch";
         version = "20171123.346";
         src = fetchFromGitHub {
           owner = "jamiguet";
@@ -61919,6 +64368,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "never-comment";
+        ename = "never-comment";
         version = "20140104.1407";
         src = fetchFromGitHub {
           owner = "To1ne";
@@ -61943,6 +64393,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "newlisp-mode";
+        ename = "newlisp-mode";
         version = "20160226.745";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -61967,6 +64418,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "nexus";
+        ename = "nexus";
         version = "20140114.505";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -61992,6 +64444,7 @@
                             , typescript-mode }:
       melpaBuild {
         pname = "ng2-mode";
+        ename = "ng2-mode";
         version = "20180520.1731";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -62016,6 +64469,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nginx-mode";
+        ename = "nginx-mode";
         version = "20170611.2137";
         src = fetchFromGitHub {
           owner = "ajc";
@@ -62040,6 +64494,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "niceify-info";
+        ename = "niceify-info";
         version = "20160416.544";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -62067,6 +64522,7 @@
                             , request }:
       melpaBuild {
         pname = "niconama";
+        ename = "niconama";
         version = "20170910.801";
         src = fetchFromGitHub {
           owner = "NOBUTOKA";
@@ -62092,6 +64548,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "night-owl-theme";
+        ename = "night-owl-theme";
         version = "20180630.1431";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -62118,6 +64575,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "nikola";
+        ename = "nikola";
         version = "20170703.1321";
         src = fetchgit {
           url = "https://git.daemons.it/drymer/nikola.el/";
@@ -62146,6 +64604,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nim-mode";
+        ename = "nim-mode";
         version = "20180516.1309";
         src = fetchFromGitHub {
           owner = "nim-lang";
@@ -62170,6 +64629,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "nimbus-theme";
+        ename = "nimbus-theme";
         version = "20180606.1936";
         src = fetchFromGitHub {
           owner = "m-cat";
@@ -62195,6 +64655,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ninja-mode";
+        ename = "ninja-mode";
         version = "20141203.2159";
         src = fetchFromGitHub {
           owner = "martine";
@@ -62221,6 +64682,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nix-buffer";
+        ename = "nix-buffer";
         version = "20180212.718";
         src = fetchFromGitHub {
           owner = "shlevy";
@@ -62246,6 +64708,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nix-mode";
+        ename = "nix-mode";
         version = "20180629.1501";
         src = fetchFromGitHub {
           owner = "NixOS";
@@ -62272,6 +64735,7 @@
                                , s }:
       melpaBuild {
         pname = "nix-sandbox";
+        ename = "nix-sandbox";
         version = "20171004.1006";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -62297,6 +64761,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nix-update";
+        ename = "nix-update";
         version = "20180424.1748";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -62322,6 +64787,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "nixos-options";
+        ename = "nixos-options";
         version = "20160209.1041";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -62349,6 +64815,7 @@
                              , nlinum }:
       melpaBuild {
         pname = "nlinum-hl";
+        ename = "nlinum-hl";
         version = "20170613.1748";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -62375,6 +64842,7 @@
                                    , nlinum }:
       melpaBuild {
         pname = "nlinum-relative";
+        ename = "nlinum-relative";
         version = "20160526.8";
         src = fetchFromGitHub {
           owner = "CodeFalling";
@@ -62403,6 +64871,7 @@
                       , peg }:
       melpaBuild {
         pname = "nm";
+        ename = "nm";
         version = "20151110.1110";
         src = fetchFromGitHub {
           owner = "tjim";
@@ -62427,6 +64896,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nnir-est";
+        ename = "nnir-est";
         version = "20180710.1403";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -62452,6 +64922,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "no-emoji";
+        ename = "no-emoji";
         version = "20180515.1137";
         src = fetchFromGitHub {
           owner = "ecraven";
@@ -62477,6 +64948,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "no-littering";
+        ename = "no-littering";
         version = "20180620.600";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -62504,6 +64976,7 @@
                         , request }:
       melpaBuild {
         pname = "noaa";
+        ename = "noaa";
         version = "20180419.1133";
         src = fetchFromGitHub {
           owner = "thomp";
@@ -62528,6 +65001,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "noccur";
+        ename = "noccur";
         version = "20150514.1420";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -62552,6 +65026,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "nocomments-mode";
+        ename = "nocomments-mode";
         version = "20170213.1237";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -62577,6 +65052,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "noctilux-theme";
+        ename = "noctilux-theme";
         version = "20161113.642";
         src = fetchFromGitHub {
           owner = "sjrmanning";
@@ -62602,6 +65078,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "node-resolver";
+        ename = "node-resolver";
         version = "20140930.1023";
         src = fetchFromGitHub {
           owner = "meandavejustice";
@@ -62626,6 +65103,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "nodejs-repl";
+        ename = "nodejs-repl";
         version = "20170722.443";
         src = fetchFromGitHub {
           owner = "abicky";
@@ -62651,6 +65129,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "nodemcu-mode";
+        ename = "nodemcu-mode";
         version = "20180501.1525";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -62675,6 +65154,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "noflet";
+        ename = "noflet";
         version = "20141102.654";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -62700,6 +65180,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "nofrils-acme-theme";
+        ename = "nofrils-acme-theme";
         version = "20180620.548";
         src = fetchFromGitLab {
           owner = "esessoms";
@@ -62725,6 +65206,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nord-theme";
+        ename = "nord-theme";
         version = "20180102.1001";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
@@ -62749,6 +65231,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "nordless-theme";
+        ename = "nordless-theme";
         version = "20180613.50";
         src = fetchFromGitHub {
           owner = "lthms";
@@ -62774,6 +65257,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "northcode-theme";
+        ename = "northcode-theme";
         version = "20180423.949";
         src = fetchFromGitHub {
           owner = "Northcode";
@@ -62798,6 +65282,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "nose";
+        ename = "nose";
         version = "20140520.948";
         src = fetchhg {
           url = "https://bitbucket.com/durin42/nosemacs";
@@ -62821,6 +65306,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "notmuch";
+        ename = "notmuch";
         version = "20180503.1659";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
@@ -62845,6 +65331,7 @@
                                    , notmuch }:
       melpaBuild {
         pname = "notmuch-labeler";
+        ename = "notmuch-labeler";
         version = "20131230.919";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -62872,6 +65359,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "nov";
+        ename = "nov";
         version = "20180617.1444";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -62897,6 +65385,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nova-theme";
+        ename = "nova-theme";
         version = "20180530.801";
         src = fetchFromGitHub {
           owner = "muirmanders";
@@ -62921,6 +65410,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "noxml-fold";
+        ename = "noxml-fold";
         version = "20170823.657";
         src = fetchFromGitHub {
           owner = "paddymcall";
@@ -62946,12 +65436,13 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "npm-mode";
-        version = "20171103.1135";
+        ename = "npm-mode";
+        version = "20180720.1001";
         src = fetchFromGitHub {
           owner = "mojochao";
           repo = "npm-mode";
-          rev = "91b8a5ad9301a368e1ce051e625450d7fe3884a4";
-          sha256 = "1zzx9956mfrh91d84dpl4ij9b62iza4mflr9qjlh69b8allajngn";
+          rev = "4f4b9fc2c07290ae87f65179df95be5221e76bf2";
+          sha256 = "01dnyra7j72v7alalx5gk4mkq6gddvr66facpsq1dpvi2h4d8cky";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode";
@@ -62973,6 +65464,7 @@
                                       , thingatpt ? null }:
       melpaBuild {
         pname = "nrepl-eval-sexp-fu";
+        ename = "nrepl-eval-sexp-fu";
         version = "20140311.341";
         src = fetchFromGitHub {
           owner = "samaaron";
@@ -62998,6 +65490,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nrepl-sync";
+        ename = "nrepl-sync";
         version = "20140807.854";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -63022,12 +65515,13 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nsis-mode";
-        version = "20180523.649";
+        ename = "nsis-mode";
+        version = "20180718.2008";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "nsis-mode";
-          rev = "4e4b6add79cd9a1d8dbe30a4f29de5e96b1170f2";
-          sha256 = "105drr8baa41z7g4smzjimg1hml98rrafifcwb1dhfx32ww9ijsw";
+          rev = "a49f5dbc8a5e60d3bbb803582efb5468bbbe7507";
+          sha256 = "05c8dhys08xmd53ya0633c1lhki5mraz0hqizwz2s5511anj417d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9b169a80c7afdeb0c6e17cd289114b5d3d97266/recipes/nsis-mode";
@@ -63051,6 +65545,7 @@
                            , which-key }:
       melpaBuild {
         pname = "nu-mode";
+        ename = "nu-mode";
         version = "20180619.1428";
         src = fetchFromGitHub {
           owner = "pyluyten";
@@ -63081,6 +65576,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "nubox";
+        ename = "nubox";
         version = "20170619.210";
         src = fetchFromGitHub {
           owner = "martijnat";
@@ -63105,6 +65601,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "number";
+        ename = "number";
         version = "20170901.612";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -63129,6 +65626,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "number-lock";
+        ename = "number-lock";
         version = "20160829.1900";
         src = fetchFromGitHub {
           owner = "Liu233w";
@@ -63154,6 +65652,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "numbers";
+        ename = "numbers";
         version = "20170802.434";
         src = fetchFromGitHub {
           owner = "davep";
@@ -63178,6 +65677,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nummm-mode";
+        ename = "nummm-mode";
         version = "20131117.214";
         src = fetchFromGitHub {
           owner = "agpchil";
@@ -63203,6 +65703,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "nv-delete-back";
+        ename = "nv-delete-back";
         version = "20170224.449";
         src = fetchFromGitLab {
           owner = "nivaca";
@@ -63231,6 +65732,7 @@
                        , s }:
       melpaBuild {
         pname = "nvm";
+        ename = "nvm";
         version = "20171217.836";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -63255,6 +65757,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nyan-mode";
+        ename = "nyan-mode";
         version = "20170423.40";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
@@ -63280,6 +65783,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nyx-theme";
+        ename = "nyx-theme";
         version = "20170910.607";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
@@ -63304,6 +65808,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "o-blog";
+        ename = "o-blog";
         version = "20151202.1539";
         src = fetchFromGitHub {
           owner = "renard";
@@ -63328,6 +65833,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "oauth";
+        ename = "oauth";
         version = "20130127.1751";
         src = fetchFromGitHub {
           owner = "psanford";
@@ -63352,6 +65858,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ob-applescript";
+        ename = "ob-applescript";
         version = "20160914.1327";
         src = fetchFromGitHub {
           owner = "stig";
@@ -63380,6 +65887,7 @@
                             , org }:
       melpaBuild {
         pname = "ob-async";
+        ename = "ob-async";
         version = "20180624.1553";
         src = fetchFromGitHub {
           owner = "astahlman";
@@ -63406,6 +65914,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ob-axiom";
+        ename = "ob-axiom";
         version = "20171103.1548";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
@@ -63429,6 +65938,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ob-blockdiag";
+        ename = "ob-blockdiag";
         version = "20170727.1801";
         src = fetchFromGitHub {
           owner = "corpix";
@@ -63454,6 +65964,7 @@
                               , org }:
       melpaBuild {
         pname = "ob-browser";
+        ename = "ob-browser";
         version = "20170720.1218";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -63478,6 +65989,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ob-cfengine3";
+        ename = "ob-cfengine3";
         version = "20180102.1012";
         src = fetchFromGitHub {
           owner = "nickanderson";
@@ -63504,6 +66016,7 @@
                                     , org }:
       melpaBuild {
         pname = "ob-clojurescript";
+        ename = "ob-clojurescript";
         version = "20180406.1128";
         src = fetchFromGitLab {
           owner = "statonjr";
@@ -63529,6 +66042,7 @@
                              , org }:
       melpaBuild {
         pname = "ob-coffee";
+        ename = "ob-coffee";
         version = "20170725.724";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63554,6 +66068,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ob-coffeescript";
+        ename = "ob-coffeescript";
         version = "20180125.2319";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -63579,6 +66094,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ob-crystal";
+        ename = "ob-crystal";
         version = "20180125.2318";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -63607,6 +66123,7 @@
                              , s }:
       melpaBuild {
         pname = "ob-cypher";
+        ename = "ob-cypher";
         version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63632,6 +66149,7 @@
                           , org }:
       melpaBuild {
         pname = "ob-dao";
+        ename = "ob-dao";
         version = "20170816.858";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -63656,6 +66174,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ob-dart";
+        ename = "ob-dart";
         version = "20170106.824";
         src = fetchFromGitHub {
           owner = "mzimmerm";
@@ -63680,6 +66199,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ob-diagrams";
+        ename = "ob-diagrams";
         version = "20160407.537";
         src = fetchFromGitHub {
           owner = "bergey";
@@ -63705,6 +66225,7 @@
                              , org }:
       melpaBuild {
         pname = "ob-elixir";
+        ename = "ob-elixir";
         version = "20170725.719";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63729,6 +66250,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ob-elvish";
+        ename = "ob-elvish";
         version = "20180427.1200";
         src = fetchFromGitHub {
           owner = "zzamboni";
@@ -63755,6 +66277,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ob-fsharp";
+        ename = "ob-fsharp";
         version = "20170618.729";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -63779,6 +66302,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "ob-go";
+        ename = "ob-go";
         version = "20170731.1057";
         src = fetchFromGitHub {
           owner = "pope";
@@ -63805,6 +66329,7 @@
                            , s }:
       melpaBuild {
         pname = "ob-http";
+        ename = "ob-http";
         version = "20180707.748";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63830,6 +66355,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "ob-hy";
+        ename = "ob-hy";
         version = "20180701.2240";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -63859,6 +66385,7 @@
                               , s }:
       melpaBuild {
         pname = "ob-ipython";
+        ename = "ob-ipython";
         version = "20180224.153";
         src = fetchFromGitHub {
           owner = "gregsexton";
@@ -63884,6 +66411,7 @@
                              , org }:
       melpaBuild {
         pname = "ob-kotlin";
+        ename = "ob-kotlin";
         version = "20170725.718";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63909,6 +66437,7 @@
                           , org }:
       melpaBuild {
         pname = "ob-lfe";
+        ename = "ob-lfe";
         version = "20170725.720";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -63933,6 +66462,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ob-mermaid";
+        ename = "ob-mermaid";
         version = "20180522.959";
         src = fetchFromGitHub {
           owner = "arnm";
@@ -63957,6 +66487,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ob-ml-marklogic";
+        ename = "ob-ml-marklogic";
         version = "20170622.1133";
         src = fetchFromGitHub {
           owner = "ndw";
@@ -63982,6 +66513,7 @@
                             , org }:
       melpaBuild {
         pname = "ob-mongo";
+        ename = "ob-mongo";
         version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -64007,6 +66539,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ob-nim";
+        ename = "ob-nim";
         version = "20170809.1130";
         src = fetchFromGitHub {
           owner = "lompik";
@@ -64031,12 +66564,13 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ob-prolog";
-        version = "20180328.1034";
+        ename = "ob-prolog";
+        version = "20180720.344";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "ob-prolog";
-          rev = "8e34b273730423f267138e9f9a0abe7718f3a5fa";
-          sha256 = "0kn4dph1wfigh9l8r8ghxgnixjxawfh335kh4ypab1hb528pdq2n";
+          rev = "85ada8fc1f523167f137746c82d823a194160141";
+          sha256 = "1fa3hn9l9av7z6g4az8cfr2157g5cdryzp8nrmjr8w9386p13m4l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
@@ -64056,6 +66590,7 @@
                                  , restclient }:
       melpaBuild {
         pname = "ob-restclient";
+        ename = "ob-restclient";
         version = "20180703.902";
         src = fetchFromGitHub {
           owner = "alf";
@@ -64080,6 +66615,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ob-rust";
+        ename = "ob-rust";
         version = "20180606.1646";
         src = fetchFromGitHub {
           owner = "micanzhang";
@@ -64107,6 +66643,7 @@
                                , sage-shell-mode }:
       melpaBuild {
         pname = "ob-sagemath";
+        ename = "ob-sagemath";
         version = "20170130.1833";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -64132,6 +66669,7 @@
                           , sml-mode }:
       melpaBuild {
         pname = "ob-sml";
+        ename = "ob-sml";
         version = "20130829.1143";
         src = fetchFromGitHub {
           owner = "swannodette";
@@ -64157,6 +66695,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ob-sql-mode";
+        ename = "ob-sql-mode";
         version = "20180426.1211";
         src = fetchFromGitHub {
           owner = "nikclayton";
@@ -64182,6 +66721,7 @@
                             , org }:
       melpaBuild {
         pname = "ob-swift";
+        ename = "ob-swift";
         version = "20170921.625";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -64208,6 +66748,7 @@
                                 , org }:
       melpaBuild {
         pname = "ob-translate";
+        ename = "ob-translate";
         version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -64234,6 +66775,7 @@
                                  , org }:
       melpaBuild {
         pname = "ob-typescript";
+        ename = "ob-typescript";
         version = "20150804.530";
         src = fetchFromGitHub {
           owner = "lurdan";
@@ -64258,6 +66800,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ob-uart";
+        ename = "ob-uart";
         version = "20170521.158";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -64282,6 +66825,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "oberon";
+        ename = "oberon";
         version = "20120715.209";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -64307,6 +66851,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "obfusurl";
+        ename = "obfusurl";
         version = "20170809.824";
         src = fetchFromGitHub {
           owner = "davep";
@@ -64331,6 +66876,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "objc-font-lock";
+        ename = "objc-font-lock";
         version = "20141021.1122";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -64355,6 +66901,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "obsidian-theme";
+        ename = "obsidian-theme";
         version = "20170719.248";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -64379,6 +66926,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "occidental-theme";
+        ename = "occidental-theme";
         version = "20130312.1258";
         src = fetchFromGitHub {
           owner = "olcai";
@@ -64403,6 +66951,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "occur-context-resize";
+        ename = "occur-context-resize";
         version = "20170904.1609";
         src = fetchFromGitHub {
           owner = "dgtized";
@@ -64427,6 +66976,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "occur-x";
+        ename = "occur-x";
         version = "20130610.643";
         src = fetchFromGitHub {
           owner = "juan-leon";
@@ -64451,6 +67001,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "oceanic-theme";
+        ename = "oceanic-theme";
         version = "20161015.119";
         src = fetchFromGitHub {
           owner = "terry3";
@@ -64476,6 +67027,7 @@
                                        , svg-mode-line-themes }:
       melpaBuild {
         pname = "ocodo-svg-modelines";
+        ename = "ocodo-svg-modelines";
         version = "20150516.719";
         src = fetchFromGitHub {
           owner = "ocodo";
@@ -64500,6 +67052,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ocp-indent";
+        ename = "ocp-indent";
         version = "20180417.849";
         src = fetchFromGitHub {
           owner = "OCamlPro";
@@ -64525,6 +67078,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "octicons";
+        ename = "octicons";
         version = "20151031.2040";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -64550,6 +67104,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "octo-mode";
+        ename = "octo-mode";
         version = "20161008.529";
         src = fetchFromGitHub {
           owner = "cryon";
@@ -64574,6 +67129,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "octopress";
+        ename = "octopress";
         version = "20170813.615";
         src = fetchFromGitHub {
           owner = "aaronbieber";
@@ -64598,6 +67154,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "offlineimap";
+        ename = "offlineimap";
         version = "20150916.458";
         src = fetchFromGitHub {
           owner = "jd";
@@ -64623,6 +67180,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "old-norse-input";
+        ename = "old-norse-input";
         version = "20170816.1142";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -64648,6 +67206,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "oldlace-theme";
+        ename = "oldlace-theme";
         version = "20150705.600";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -64673,6 +67232,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "olivetti";
+        ename = "olivetti";
         version = "20180531.37";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -64697,6 +67257,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "om-mode";
+        ename = "om-mode";
         version = "20140915.1410";
         src = fetchFromGitHub {
           owner = "danielsz";
@@ -64721,6 +67282,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "omni-kill";
+        ename = "omni-kill";
         version = "20171016.1440";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -64749,6 +67311,7 @@
                             , s }:
       melpaBuild {
         pname = "omni-log";
+        ename = "omni-log";
         version = "20170930.535";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -64778,6 +67341,7 @@
                                , s }:
       melpaBuild {
         pname = "omni-quotes";
+        ename = "omni-quotes";
         version = "20170425.1132";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -64802,6 +67366,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "omni-scratch";
+        ename = "omni-scratch";
         version = "20171009.1451";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -64828,6 +67393,7 @@
                              , pcre2el }:
       melpaBuild {
         pname = "omni-tags";
+        ename = "omni-tags";
         version = "20170426.1409";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -64855,6 +67421,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "omnibox";
+        ename = "omnibox";
         version = "20180422.1749";
         src = fetchFromGitHub {
           owner = "sebastiencs";
@@ -64889,6 +67456,7 @@
                              , shut-up }:
       melpaBuild {
         pname = "omnisharp";
+        ename = "omnisharp";
         version = "20180606.318";
         src = fetchFromGitHub {
           owner = "OmniSharp";
@@ -64924,6 +67492,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "omtose-phellack-theme";
+        ename = "omtose-phellack-theme";
         version = "20161111.1320";
         src = fetchFromGitHub {
           owner = "franksn";
@@ -64952,6 +67521,7 @@
                              , smartparens }:
       melpaBuild {
         pname = "on-parens";
+        ename = "on-parens";
         version = "20180202.1441";
         src = fetchFromGitHub {
           owner = "willghatch";
@@ -64977,6 +67547,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "on-screen";
+        ename = "on-screen";
         version = "20160302.150";
         src = fetchFromGitHub {
           owner = "michael-heerdegen";
@@ -65002,6 +67573,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "one-themes";
+        ename = "one-themes";
         version = "20180507.1008";
         src = fetchFromGitHub {
           owner = "balajisivaraman";
@@ -65026,6 +67598,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "one-time-pad-encrypt";
+        ename = "one-time-pad-encrypt";
         version = "20160329.813";
         src = fetchFromGitHub {
           owner = "garvinguan";
@@ -65051,6 +67624,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "opam";
+        ename = "opam";
         version = "20150719.520";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -65075,6 +67649,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "open-in-msvs";
+        ename = "open-in-msvs";
         version = "20170123.1428";
         src = fetchFromGitHub {
           owner = "evgeny-panasyuk";
@@ -65099,6 +67674,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "open-junk-file";
+        ename = "open-junk-file";
         version = "20161210.314";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -65124,6 +67700,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "opencc";
+        ename = "opencc";
         version = "20170722.116";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -65148,6 +67725,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "opencl-mode";
+        ename = "opencl-mode";
         version = "20170816.549";
         src = fetchFromGitHub {
           owner = "salmanebah";
@@ -65175,6 +67753,7 @@
                           , request }:
       melpaBuild {
         pname = "opener";
+        ename = "opener";
         version = "20161207.1010";
         src = fetchFromGitHub {
           owner = "0robustus1";
@@ -65203,6 +67782,7 @@
                               , s }:
       melpaBuild {
         pname = "opensource";
+        ename = "opensource";
         version = "20160926.916";
         src = fetchFromGitHub {
           owner = "OpenSourceOrg";
@@ -65227,6 +67807,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "openstack-cgit-browse-file";
+        ename = "openstack-cgit-browse-file";
         version = "20130819.227";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -65251,6 +67832,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "openwith";
+        ename = "openwith";
         version = "20120531.1436";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/openwith";
@@ -65274,6 +67856,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "operate-on-number";
+        ename = "operate-on-number";
         version = "20150706.2323";
         src = fetchFromGitHub {
           owner = "knu";
@@ -65299,6 +67882,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "orca";
+        ename = "orca";
         version = "20171030.1216";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -65326,6 +67910,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "org-ac";
+        ename = "org-ac";
         version = "20170401.607";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -65351,6 +67936,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "org-agenda-property";
+        ename = "org-agenda-property";
         version = "20140626.1416";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -65378,6 +67964,7 @@
                              , s }:
       melpaBuild {
         pname = "org-alert";
+        ename = "org-alert";
         version = "20180523.1833";
         src = fetchFromGitHub {
           owner = "groksteve";
@@ -65402,6 +67989,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "org-attach-screenshot";
+        ename = "org-attach-screenshot";
         version = "20180419.2225";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -65426,6 +68014,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-autolist";
+        ename = "org-autolist";
         version = "20170924.1201";
         src = fetchFromGitHub {
           owner = "calvinwyoung";
@@ -65454,6 +68043,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "org-babel-eval-in-repl";
+        ename = "org-babel-eval-in-repl";
         version = "20170511.514";
         src = fetchFromGitHub {
           owner = "diadochos";
@@ -65478,6 +68068,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "org-beautify-theme";
+        ename = "org-beautify-theme";
         version = "20170908.1518";
         src = fetchFromGitHub {
           owner = "jonnay";
@@ -65502,6 +68093,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-board";
+        ename = "org-board";
         version = "20180530.1120";
         src = fetchFromGitHub {
           owner = "scallywag";
@@ -65527,6 +68119,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "org-bookmark-heading";
+        ename = "org-bookmark-heading";
         version = "20170510.1008";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -65553,6 +68146,7 @@
                              , org }:
       melpaBuild {
         pname = "org-brain";
+        ename = "org-brain";
         version = "20180712.1410";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -65577,6 +68171,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-bullets";
+        ename = "org-bullets";
         version = "20171127.526";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -65602,6 +68197,7 @@
                               , org }:
       melpaBuild {
         pname = "org-caldav";
+        ename = "org-caldav";
         version = "20180403.1336";
         src = fetchFromGitHub {
           owner = "dengste";
@@ -65627,6 +68223,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "org-capture-pop-frame";
+        ename = "org-capture-pop-frame";
         version = "20160518.308";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -65653,6 +68250,7 @@
                                         , org }:
       melpaBuild {
         pname = "org-category-capture";
+        ename = "org-category-capture";
         version = "20180531.1942";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -65679,6 +68277,7 @@
                             , org }:
       melpaBuild {
         pname = "org-chef";
+        ename = "org-chef";
         version = "20180706.1835";
         src = fetchFromGitHub {
           owner = "Chobbes";
@@ -65704,12 +68303,13 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-cliplink";
-        version = "20180526.738";
+        ename = "org-cliplink";
+        version = "20180717.408";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "e6b4a481d0c2d7734c01d5d80cce6c4348925524";
-          sha256 = "09fm8iihzzr706yfnjfswkp52rhdalkvc5yf2hnk3376jlcvpxnx";
+          rev = "7d35b09ebdb160a2aee3145766454a11d27b3fb7";
+          sha256 = "0kskxy07i2yhb36ncsqxm50m2cry40qc7gg4x4z7rhbmski653ab";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -65731,6 +68331,7 @@
                                          , org }:
       melpaBuild {
         pname = "org-clock-convenience";
+        ename = "org-clock-convenience";
         version = "20160830.1156";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -65757,6 +68358,7 @@
                                  , s }:
       melpaBuild {
         pname = "org-clock-csv";
+        ename = "org-clock-csv";
         version = "20180313.1957";
         src = fetchFromGitHub {
           owner = "atheriel";
@@ -65782,6 +68384,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-clock-today";
+        ename = "org-clock-today";
         version = "20161014.220";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -65809,6 +68412,7 @@
                                   , org }:
       melpaBuild {
         pname = "org-commentary";
+        ename = "org-commentary";
         version = "20160801.2337";
         src = fetchFromGitHub {
           owner = "smaximov";
@@ -65833,6 +68437,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-context";
+        ename = "org-context";
         version = "20170107.537";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -65857,6 +68462,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-cua-dwim";
+        ename = "org-cua-dwim";
         version = "20120202.2134";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -65882,6 +68488,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-dashboard";
+        ename = "org-dashboard";
         version = "20171223.1124";
         src = fetchFromGitHub {
           owner = "bard";
@@ -65906,6 +68513,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-doing";
+        ename = "org-doing";
         version = "20161017.920";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -65932,6 +68540,7 @@
                                 , org }:
       melpaBuild {
         pname = "org-dotemacs";
+        ename = "org-dotemacs";
         version = "20151119.1022";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -65957,6 +68566,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-download";
+        ename = "org-download";
         version = "20180625.842";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -65982,6 +68592,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "org-dp";
+        ename = "org-dp";
         version = "20180311.123";
         src = fetchFromGitHub {
           owner = "tj64";
@@ -66011,6 +68622,7 @@
                                    , s }:
       melpaBuild {
         pname = "org-drill-table";
+        ename = "org-drill-table";
         version = "20180115.209";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -66038,6 +68650,7 @@
                                , names }:
       melpaBuild {
         pname = "org-dropbox";
+        ename = "org-dropbox";
         version = "20150113.2109";
         src = fetchFromGitHub {
           owner = "heikkil";
@@ -66063,6 +68676,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "org-easy-img-insert";
+        ename = "org-easy-img-insert";
         version = "20160915.1308";
         src = fetchFromGitHub {
           owner = "tashrifsanil";
@@ -66089,6 +68703,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-edit-latex";
+        ename = "org-edit-latex";
         version = "20170908.822";
         src = fetchFromGitHub {
           owner = "et2010";
@@ -66115,6 +68730,7 @@
                              , web-server }:
       melpaBuild {
         pname = "org-ehtml";
+        ename = "org-ehtml";
         version = "20150506.1658";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -66141,6 +68757,7 @@
                                   , org }:
       melpaBuild {
         pname = "org-elisp-help";
+        ename = "org-elisp-help";
         version = "20161121.1655";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -66169,6 +68786,7 @@
                             , org }:
       melpaBuild {
         pname = "org-evil";
+        ename = "org-evil";
         version = "20180620.817";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -66193,6 +68811,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "org-fancy-priorities";
+        ename = "org-fancy-priorities";
         version = "20180328.1631";
         src = fetchFromGitHub {
           owner = "harrybournis";
@@ -66222,6 +68841,7 @@
                             , request-deferred }:
       melpaBuild {
         pname = "org-gcal";
+        ename = "org-gcal";
         version = "20170420.1401";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -66249,6 +68869,7 @@
                              , telepathy }:
       melpaBuild {
         pname = "org-gnome";
+        ename = "org-gnome";
         version = "20150614.757";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -66274,6 +68895,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "org-grep";
+        ename = "org-grep";
         version = "20151202.429";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -66298,6 +68920,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "org-if";
+        ename = "org-if";
         version = "20150920.813";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -66323,12 +68946,13 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-index";
-        version = "20180519.725";
+        ename = "org-index";
+        version = "20180720.127";
         src = fetchFromGitHub {
           owner = "marcihm";
           repo = "org-index";
-          rev = "cc0039eae6986a416cc4b6702e82254718cf54ee";
-          sha256 = "1b042qs3hffy4ssnk3gpypz490k80ry5cjyfa4k4xpj72nqhsl6d";
+          rev = "54b1485eea187575840e4eac79b950273d243455";
+          sha256 = "1fmq30768cqhz52frkvrcr52wzbpaqbgwvgl28gac2dxzypg9zgb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
@@ -66350,6 +68974,7 @@
                           , org }:
       melpaBuild {
         pname = "org-iv";
+        ename = "org-iv";
         version = "20171001.322";
         src = fetchFromGitHub {
           owner = "kuangdash";
@@ -66378,6 +69003,7 @@
                             , s }:
       melpaBuild {
         pname = "org-jira";
+        ename = "org-jira";
         version = "20180625.2111";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -66403,6 +69029,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-journal";
+        ename = "org-journal";
         version = "20180603.102";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -66430,12 +69057,13 @@
                               , org }:
       melpaBuild {
         pname = "org-kanban";
-        version = "20180715.1023";
+        ename = "org-kanban";
+        version = "20180722.1158";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "9d147cfbfd378aecafaa6622eadcffde8a9f5970";
-          sha256 = "163xc1gvvg3n4vw732ybv2pclg7vij4cwhzdya38gcdmybbz7hxv";
+          rev = "4f499e97c4583e99b042f579110a8be197337bda";
+          sha256 = "0z7k240j1jqw8dqxwqr06ljnlmx3q0grrbangfr5py9z48dc63vl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
@@ -66455,6 +69083,7 @@
                                        , org }:
       melpaBuild {
         pname = "org-link-minor-mode";
+        ename = "org-link-minor-mode";
         version = "20170805.1152";
         src = fetchFromGitHub {
           owner = "seanohalpin";
@@ -66480,6 +69109,7 @@
                                    , org }:
       melpaBuild {
         pname = "org-link-travis";
+        ename = "org-link-travis";
         version = "20140405.1627";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -66506,6 +69136,7 @@
                                , yaxception }:
       melpaBuild {
         pname = "org-linkany";
+        ename = "org-linkany";
         version = "20160206.2011";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -66533,6 +69164,7 @@
                                     , seq }:
       melpaBuild {
         pname = "org-listcruncher";
+        ename = "org-listcruncher";
         version = "20180630.1326";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -66561,6 +69193,7 @@
                                 , s }:
       melpaBuild {
         pname = "org-make-toc";
+        ename = "org-make-toc";
         version = "20180614.1959";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -66587,6 +69220,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "org-mime";
+        ename = "org-mime";
         version = "20180607.2350";
         src = fetchFromGitHub {
           owner = "org-mime";
@@ -66614,6 +69248,7 @@
                                 , org }:
       melpaBuild {
         pname = "org-mind-map";
+        ename = "org-mind-map";
         version = "20180614.1352";
         src = fetchFromGitHub {
           owner = "theodorewiles";
@@ -66640,6 +69275,7 @@
                                    , org }:
       melpaBuild {
         pname = "org-mobile-sync";
+        ename = "org-mobile-sync";
         version = "20180605.2224";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/org-mobile-sync.git";
@@ -66664,6 +69300,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-mru-clock";
+        ename = "org-mru-clock";
         version = "20180419.606";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -66691,6 +69328,7 @@
                                        , org }:
       melpaBuild {
         pname = "org-multiple-keymap";
+        ename = "org-multiple-keymap";
         version = "20150328.1806";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -66718,6 +69356,7 @@
                                 , org }:
       melpaBuild {
         pname = "org-notebook";
+        ename = "org-notebook";
         version = "20170321.2152";
         src = fetchFromGitHub {
           owner = "Rahi374";
@@ -66745,12 +69384,13 @@
                              , org }:
       melpaBuild {
         pname = "org-noter";
-        version = "20180708.1429";
+        ename = "org-noter";
+        version = "20180722.853";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "8f86583bd573cb0f146aae5d2394e615efb0cafe";
-          sha256 = "0fgmn7gqh146zrmvc1p7dik93sjajay0n8i8qdd4sbdzw64shzl1";
+          rev = "447c890e173884e9ca459b73ac3a771fc59e8512";
+          sha256 = "01akk7zdyijclb3igmm56xyz2h9ffc0j0skawb1xwwrni7aphnbm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -66772,6 +69412,7 @@
                                  , orglue }:
       melpaBuild {
         pname = "org-octopress";
+        ename = "org-octopress";
         version = "20170820.2115";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
@@ -66799,6 +69440,7 @@
                                , request }:
       melpaBuild {
         pname = "org-onenote";
+        ename = "org-onenote";
         version = "20171007.2200";
         src = fetchFromGitHub {
           owner = "ifree";
@@ -66827,6 +69469,7 @@
                                          , ov }:
       melpaBuild {
         pname = "org-outline-numbering";
+        ename = "org-outline-numbering";
         version = "20180705.801";
         src = fetchFromGitLab {
           owner = "andersjohansson";
@@ -66851,6 +69494,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-outlook";
+        ename = "org-outlook";
         version = "20160705.638";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -66883,6 +69527,7 @@
                             , simple-httpd }:
       melpaBuild {
         pname = "org-page";
+        ename = "org-page";
         version = "20170806.1924";
         src = fetchFromGitHub {
           owner = "kelvinh";
@@ -66919,6 +69564,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "org-parser";
+        ename = "org-parser";
         version = "20171002.2136";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
@@ -66945,6 +69591,7 @@
                                         , s }:
       melpaBuild {
         pname = "org-password-manager";
+        ename = "org-password-manager";
         version = "20180227.1010";
         src = fetchgit {
           url = "https://github.com/leafac/org-password-manager";
@@ -66970,6 +69617,7 @@
                                , pdf-tools }:
       melpaBuild {
         pname = "org-pdfview";
+        ename = "org-pdfview";
         version = "20180225.206";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -66996,6 +69644,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-pomodoro";
+        ename = "org-pomodoro";
         version = "20171108.1314";
         src = fetchFromGitHub {
           owner = "lolownia";
@@ -67021,6 +69670,7 @@
                                , org }:
       melpaBuild {
         pname = "org-present";
+        ename = "org-present";
         version = "20180303.1530";
         src = fetchFromGitHub {
           owner = "rlister";
@@ -67047,6 +69697,7 @@
                                     , org }:
       melpaBuild {
         pname = "org-preview-html";
+        ename = "org-preview-html";
         version = "20180624.2319";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -67076,6 +69727,7 @@
                                   , s }:
       melpaBuild {
         pname = "org-projectile";
+        ename = "org-projectile";
         version = "20180531.1942";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -67103,6 +69755,7 @@
                                        , org-projectile }:
       melpaBuild {
         pname = "org-projectile-helm";
+        ename = "org-projectile-helm";
         version = "20180601.1122";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -67128,6 +69781,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "org-protocol-jekyll";
+        ename = "org-protocol-jekyll";
         version = "20170328.939";
         src = fetchFromGitHub {
           owner = "vonavi";
@@ -67154,6 +69808,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-radiobutton";
+        ename = "org-radiobutton";
         version = "20180612.328";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -67180,6 +69835,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-random-todo";
+        ename = "org-random-todo";
         version = "20180312.104";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -67206,6 +69862,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-randomnote";
+        ename = "org-randomnote";
         version = "20171210.557";
         src = fetchFromGitHub {
           owner = "mwfogleman";
@@ -67235,6 +69892,7 @@
                               , yaoddmuse }:
       melpaBuild {
         pname = "org-readme";
+        ename = "org-readme";
         version = "20151204.417";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -67269,6 +69927,7 @@
                                        , org }:
       melpaBuild {
         pname = "org-recent-headings";
+        ename = "org-recent-headings";
         version = "20170907.2129";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -67293,6 +69952,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-redmine";
+        ename = "org-redmine";
         version = "20160711.414";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -67328,6 +69988,7 @@
                            , s }:
       melpaBuild {
         pname = "org-ref";
+        ename = "org-ref";
         version = "20180706.614";
         src = fetchFromGitHub {
           owner = "jkitchin";
@@ -67364,6 +70025,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-repo-todo";
+        ename = "org-repo-todo";
         version = "20171227.1719";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -67388,6 +70050,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "org-review";
+        ename = "org-review";
         version = "20160906.2237";
         src = fetchFromGitHub {
           owner = "brabalan";
@@ -67413,6 +70076,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-rich-yank";
+        ename = "org-rich-yank";
         version = "20180430.644";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -67438,6 +70102,7 @@
                            , rtm }:
       melpaBuild {
         pname = "org-rtm";
+        ename = "org-rtm";
         version = "20160214.436";
         src = fetchFromGitHub {
           owner = "pmiddend";
@@ -67464,6 +70129,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "org-seek";
+        ename = "org-seek";
         version = "20161216.2102";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -67491,6 +70157,7 @@
                                   , seq }:
       melpaBuild {
         pname = "org-send-ebook";
+        ename = "org-send-ebook";
         version = "20180401.1015";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -67516,6 +70183,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-static-blog";
+        ename = "org-static-blog";
         version = "20180527.2348";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -67542,6 +70210,7 @@
                                      , org }:
       melpaBuild {
         pname = "org-sticky-header";
+        ename = "org-sticky-header";
         version = "20170422.2135";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -67571,6 +70240,7 @@
                                     , s }:
       melpaBuild {
         pname = "org-super-agenda";
+        ename = "org-super-agenda";
         version = "20180714.1348";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -67598,6 +70268,7 @@
                             , org }:
       melpaBuild {
         pname = "org-sync";
+        ename = "org-sync";
         version = "20180221.1127";
         src = fetchFromGitHub {
           owner = "arbox";
@@ -67625,6 +70296,7 @@
                                      , org }:
       melpaBuild {
         pname = "org-sync-snippets";
+        ename = "org-sync-snippets";
         version = "20170824.1128";
         src = fetchFromGitHub {
           owner = "abrochard";
@@ -67649,6 +70321,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "org-table-comment";
+        ename = "org-table-comment";
         version = "20120209.1051";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -67675,6 +70348,7 @@
                                            , org }:
       melpaBuild {
         pname = "org-table-sticky-header";
+        ename = "org-table-sticky-header";
         version = "20170408.1814";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -67702,6 +70376,7 @@
                            , org }:
       melpaBuild {
         pname = "org-tfl";
+        ename = "org-tfl";
         version = "20170923.518";
         src = fetchFromGitHub {
           owner = "storax";
@@ -67727,6 +70402,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "org-themis";
+        ename = "org-themis";
         version = "20160121.2004";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -67753,6 +70429,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "org-time-budgets";
+        ename = "org-time-budgets";
         version = "20151111.1";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -67780,6 +70457,7 @@
                                 , request-deferred }:
       melpaBuild {
         pname = "org-toodledo";
+        ename = "org-toodledo";
         version = "20150301.313";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -67806,6 +70484,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-tracktable";
+        ename = "org-tracktable";
         version = "20161118.529";
         src = fetchFromGitHub {
           owner = "tty-tourist";
@@ -67832,6 +70511,7 @@
                                             , s }:
       melpaBuild {
         pname = "org-transform-tree-table";
+        ename = "org-transform-tree-table";
         version = "20150110.633";
         src = fetchFromGitHub {
           owner = "jplindstrom";
@@ -67856,6 +70536,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-tree-slide";
+        ename = "org-tree-slide";
         version = "20180424.1636";
         src = fetchFromGitHub {
           owner = "takaxp";
@@ -67885,6 +70566,7 @@
                               , s }:
       melpaBuild {
         pname = "org-trello";
+        ename = "org-trello";
         version = "20180330.2331";
         src = fetchFromGitHub {
           owner = "org-trello";
@@ -67910,6 +70592,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "org-variable-pitch";
+        ename = "org-variable-pitch";
         version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
@@ -67934,6 +70617,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-vcard";
+        ename = "org-vcard";
         version = "20170929.410";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -67958,6 +70642,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "org-wc";
+        ename = "org-wc";
         version = "20180609.1953";
         src = fetchFromGitHub {
           owner = "tesujimath";
@@ -67987,6 +70672,7 @@
                                  , s }:
       melpaBuild {
         pname = "org-web-tools";
+        ename = "org-web-tools";
         version = "20180531.1808";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -68014,6 +70700,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "org-wild-notifier";
+        ename = "org-wild-notifier";
         version = "20180221.2025";
         src = fetchFromGitHub {
           owner = "akhramov";
@@ -68044,6 +70731,7 @@
                                   , s }:
       melpaBuild {
         pname = "org-wunderlist";
+        ename = "org-wunderlist";
         version = "20150817.1913";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -68072,6 +70760,7 @@
                             , xml-rpc }:
       melpaBuild {
         pname = "org2blog";
+        ename = "org2blog";
         version = "20171218.1911";
         src = fetchFromGitHub {
           owner = "punchagan";
@@ -68097,6 +70786,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "org2ctex";
+        ename = "org2ctex";
         version = "20171016.2343";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -68122,6 +70812,7 @@
                                  , org }:
       melpaBuild {
         pname = "org2elcomment";
+        ename = "org2elcomment";
         version = "20170324.245";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -68151,6 +70842,7 @@
                              , s }:
       melpaBuild {
         pname = "org2issue";
+        ename = "org2issue";
         version = "20160426.1818";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -68179,6 +70871,7 @@
                               , s }:
       melpaBuild {
         pname = "org2jekyll";
+        ename = "org2jekyll";
         version = "20170225.115";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -68211,6 +70904,7 @@
                            , simple-httpd }:
       melpaBuild {
         pname = "org2web";
+        ename = "org2web";
         version = "20171005.1617";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -68244,6 +70938,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "organic-green-theme";
+        ename = "organic-green-theme";
         version = "20180522.920";
         src = fetchFromGitHub {
           owner = "kostafey";
@@ -68272,6 +70967,7 @@
                                          , s }:
       melpaBuild {
         pname = "organize-imports-java";
+        ename = "organize-imports-java";
         version = "20180623.1209";
         src = fetchFromGitHub {
           owner = "jcs090218";
@@ -68298,6 +70994,7 @@
                           , org }:
       melpaBuild {
         pname = "orgbox";
+        ename = "orgbox";
         version = "20140528.1826";
         src = fetchFromGitHub {
           owner = "yasuhito";
@@ -68326,6 +71023,7 @@
                          , org }:
       melpaBuild {
         pname = "orgit";
+        ename = "orgit";
         version = "20180318.1301";
         src = fetchFromGitHub {
           owner = "magit";
@@ -68353,6 +71051,7 @@
                            , org }:
       melpaBuild {
         pname = "orglink";
+        ename = "orglink";
         version = "20180318.1323";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -68379,6 +71078,7 @@
                           , org }:
       melpaBuild {
         pname = "orglue";
+        ename = "orglue";
         version = "20171220.426";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
@@ -68407,6 +71107,7 @@
                           , s }:
       melpaBuild {
         pname = "orgnav";
+        ename = "orgnav";
         version = "20170608.1013";
         src = fetchFromGitHub {
           owner = "facetframer";
@@ -68431,6 +71132,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "orgtbl-aggregate";
+        ename = "orgtbl-aggregate";
         version = "20180620.1043";
         src = fetchFromGitHub {
           owner = "tbanel";
@@ -68455,6 +71157,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "orgtbl-ascii-plot";
+        ename = "orgtbl-ascii-plot";
         version = "20151215.1351";
         src = fetchFromGitHub {
           owner = "tbanel";
@@ -68480,6 +71183,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "orgtbl-join";
+        ename = "orgtbl-join";
         version = "20150121.1446";
         src = fetchFromGitHub {
           owner = "tbanel";
@@ -68504,6 +71208,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "orgtbl-show-header";
+        ename = "orgtbl-show-header";
         version = "20141023.137";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -68532,6 +71237,7 @@
                            , s }:
       melpaBuild {
         pname = "origami";
+        ename = "origami";
         version = "20180101.753";
         src = fetchFromGitHub {
           owner = "gregsexton";
@@ -68558,6 +71264,7 @@
                               , string-utils }:
       melpaBuild {
         pname = "osx-browse";
+        ename = "osx-browse";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -68582,6 +71289,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "osx-clipboard";
+        ename = "osx-clipboard";
         version = "20141012.17";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -68607,6 +71315,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "osx-dictionary";
+        ename = "osx-dictionary";
         version = "20171026.34";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -68632,6 +71341,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "osx-lib";
+        ename = "osx-lib";
         version = "20160919.1700";
         src = fetchFromGitHub {
           owner = "raghavgautam";
@@ -68656,6 +71366,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "osx-location";
+        ename = "osx-location";
         version = "20150613.217";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -68680,6 +71391,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "osx-org-clock-menubar";
+        ename = "osx-org-clock-menubar";
         version = "20150205.1311";
         src = fetchFromGitHub {
           owner = "jordonbiondo";
@@ -68704,6 +71416,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "osx-pseudo-daemon";
+        ename = "osx-pseudo-daemon";
         version = "20170721.2307";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -68729,6 +71442,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "osx-trash";
+        ename = "osx-trash";
         version = "20160520.600";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -68753,6 +71467,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "otama";
+        ename = "otama";
         version = "20160404.332";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
@@ -68779,6 +71494,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "other-emacs-eval";
+        ename = "other-emacs-eval";
         version = "20180408.648";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -68803,6 +71519,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "outline-magic";
+        ename = "outline-magic";
         version = "20180619.1119";
         src = fetchFromGitHub {
           owner = "tj64";
@@ -68827,6 +71544,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "outline-toc";
+        ename = "outline-toc";
         version = "20170730.430";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -68851,6 +71569,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "outlined-elisp-mode";
+        ename = "outlined-elisp-mode";
         version = "20131108.327";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -68876,6 +71595,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "outlook";
+        ename = "outlook";
         version = "20180428.730";
         src = fetchFromGitHub {
           owner = "asavonic";
@@ -68901,6 +71621,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "outorg";
+        ename = "outorg";
         version = "20170414.1215";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -68926,6 +71647,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "outrespace";
+        ename = "outrespace";
         version = "20180711.732";
         src = fetchFromGitHub {
           owner = "articuluxe";
@@ -68952,6 +71674,7 @@
                             , outorg }:
       melpaBuild {
         pname = "outshine";
+        ename = "outshine";
         version = "20180625.1259";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -68977,6 +71700,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ov";
+        ename = "ov";
         version = "20150311.2228";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -69002,6 +71726,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "overcast-theme";
+        ename = "overcast-theme";
         version = "20180315.1243";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -69030,6 +71755,7 @@
                             , pkg-info }:
       melpaBuild {
         pname = "overseer";
+        ename = "overseer";
         version = "20180225.2219";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -69057,6 +71783,7 @@
                             , yaxception }:
       melpaBuild {
         pname = "owdriver";
+        ename = "owdriver";
         version = "20170401.612";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -69082,6 +71809,7 @@
                                , org }:
       melpaBuild {
         pname = "ox-asciidoc";
+        ename = "ox-asciidoc";
         version = "20171111.354";
         src = fetchFromGitHub {
           owner = "yashi";
@@ -69107,6 +71835,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ox-bibtex-chinese";
+        ename = "ox-bibtex-chinese";
         version = "20170722.2009";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -69133,6 +71862,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-clip";
+        ename = "ox-clip";
         version = "20180305.1940";
         src = fetchFromGitHub {
           owner = "jkitchin";
@@ -69159,6 +71889,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-epub";
+        ename = "ox-epub";
         version = "20171202.1713";
         src = fetchFromGitHub {
           owner = "ofosos";
@@ -69183,6 +71914,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ox-gfm";
+        ename = "ox-gfm";
         version = "20170628.1402";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -69208,6 +71940,7 @@
                                  , org }:
       melpaBuild {
         pname = "ox-html5slide";
+        ename = "ox-html5slide";
         version = "20131227.2206";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -69234,12 +71967,13 @@
                            , org }:
       melpaBuild {
         pname = "ox-hugo";
-        version = "20180710.755";
+        ename = "ox-hugo";
+        version = "20180720.1121";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "41710e542ad2062b4dac346a2535f04115d0dd82";
-          sha256 = "11b9xcy16hd9bmaqcp6vyv29cdl3bl1jyg54ws29x6qk6i2lc5v9";
+          rev = "b7e04248bfdc3188e7f1dbd3d55b8d3b9c40906c";
+          sha256 = "0nfkrw4qvmhap19q6a1i8yml80jkrlrvzni9dfvxm8qjhihd74kc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -69259,6 +71993,7 @@
                                  , org }:
       melpaBuild {
         pname = "ox-impress-js";
+        ename = "ox-impress-js";
         version = "20150412.1016";
         src = fetchFromGitHub {
           owner = "kinjo";
@@ -69288,6 +72023,7 @@
                               , org }:
       melpaBuild {
         pname = "ox-ioslide";
+        ename = "ox-ioslide";
         version = "20161015.638";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -69313,6 +72049,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-jira";
+        ename = "ox-jira";
         version = "20171001.216";
         src = fetchFromGitHub {
           owner = "stig";
@@ -69339,6 +72076,7 @@
                                 , s }:
       melpaBuild {
         pname = "ox-mediawiki";
+        ename = "ox-mediawiki";
         version = "20180105.1354";
         src = fetchFromGitHub {
           owner = "tomalexander";
@@ -69364,6 +72102,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ox-minutes";
+        ename = "ox-minutes";
         version = "20180202.934";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
@@ -69391,6 +72130,7 @@
                              , ox-rst }:
       melpaBuild {
         pname = "ox-nikola";
+        ename = "ox-nikola";
         version = "20151114.316";
         src = fetchFromGitHub {
           owner = "msnoigrs";
@@ -69420,6 +72160,7 @@
                              , org }:
       melpaBuild {
         pname = "ox-pandoc";
+        ename = "ox-pandoc";
         version = "20180510.638";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -69445,6 +72186,7 @@
                                , org }:
       melpaBuild {
         pname = "ox-pukiwiki";
+        ename = "ox-pukiwiki";
         version = "20150124.916";
         src = fetchFromGitHub {
           owner = "yashi";
@@ -69470,6 +72212,7 @@
                           , org }:
       melpaBuild {
         pname = "ox-qmd";
+        ename = "ox-qmd";
         version = "20170402.957";
         src = fetchFromGitHub {
           owner = "0x60df";
@@ -69495,6 +72238,7 @@
                              , org }:
       melpaBuild {
         pname = "ox-reveal";
+        ename = "ox-reveal";
         version = "20161027.226";
         src = fetchFromGitHub {
           owner = "yjwen";
@@ -69521,6 +72265,7 @@
                           , org }:
       melpaBuild {
         pname = "ox-rst";
+        ename = "ox-rst";
         version = "20180314.1713";
         src = fetchFromGitHub {
           owner = "msnoigrs";
@@ -69546,6 +72291,7 @@
                               , org }:
       melpaBuild {
         pname = "ox-textile";
+        ename = "ox-textile";
         version = "20180502.247";
         src = fetchFromGitHub {
           owner = "yashi";
@@ -69572,6 +72318,7 @@
                              , org }:
       melpaBuild {
         pname = "ox-tiddly";
+        ename = "ox-tiddly";
         version = "20180626.1352";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -69597,6 +72344,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-trac";
+        ename = "ox-trac";
         version = "20171026.1123";
         src = fetchFromGitHub {
           owner = "JalapenoGremlin";
@@ -69623,6 +72371,7 @@
                             , org }:
       melpaBuild {
         pname = "ox-tufte";
+        ename = "ox-tufte";
         version = "20160926.907";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -69647,6 +72396,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ox-twbs";
+        ename = "ox-twbs";
         version = "20161103.1316";
         src = fetchFromGitHub {
           owner = "marsmining";
@@ -69673,6 +72423,7 @@
                             , org }:
       melpaBuild {
         pname = "ox-twiki";
+        ename = "ox-twiki";
         version = "20170803.1339";
         src = fetchFromGitHub {
           owner = "dfeich";
@@ -69697,6 +72448,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "p4";
+        ename = "p4";
         version = "20150721.1237";
         src = fetchFromGitHub {
           owner = "gareth-rees";
@@ -69721,6 +72473,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pabbrev";
+        ename = "pabbrev";
         version = "20160320.1401";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -69746,6 +72499,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "package-build";
+        ename = "package-build";
         version = "20180628.2221";
         src = fetchFromGitHub {
           owner = "melpa";
@@ -69770,6 +72524,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "package-filter";
+        ename = "package-filter";
         version = "20161121.2319";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -69796,6 +72551,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "package-lint";
+        ename = "package-lint";
         version = "20180608.2119";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -69820,6 +72576,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "package-plus";
+        ename = "package+";
         version = "20170815.1956";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -69846,6 +72603,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "package-safe-delete";
+        ename = "package-safe-delete";
         version = "20150116.807";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -69871,6 +72629,7 @@
                                  , restart-emacs }:
       melpaBuild {
         pname = "package-utils";
+        ename = "package-utils";
         version = "20180514.715";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -69896,6 +72655,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "packed";
+        ename = "packed";
         version = "20180318.1029";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -69925,6 +72685,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pacmacs";
+        ename = "pacmacs";
         version = "20160131.32";
         src = fetchFromGitHub {
           owner = "codingteam";
@@ -69950,6 +72711,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "paganini-theme";
+        ename = "paganini-theme";
         version = "20180710.821";
         src = fetchFromGitHub {
           owner = "onurtemizkan";
@@ -69975,6 +72737,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "page-break-lines";
+        ename = "page-break-lines";
         version = "20171210.31";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -69999,6 +72762,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "pager";
+        ename = "pager";
         version = "20151201.1720";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -70024,6 +72788,7 @@
                                              , pager }:
       melpaBuild {
         pname = "pager-default-keybindings";
+        ename = "pager-default-keybindings";
         version = "20130719.1357";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -70048,6 +72813,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "palimpsest";
+        ename = "palimpsest";
         version = "20170119.1232";
         src = fetchFromGitHub {
           owner = "danielsz";
@@ -70076,6 +72842,7 @@
                           , s }:
       melpaBuild {
         pname = "pallet";
+        ename = "pallet";
         version = "20150512.2";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -70104,6 +72871,7 @@
                             , worf }:
       melpaBuild {
         pname = "pamparam";
+        ename = "pamparam";
         version = "20180415.48";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -70129,6 +72897,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "panda-theme";
+        ename = "panda-theme";
         version = "20180203.2318";
         src = fetchFromGitHub {
           owner = "jamiecollinson";
@@ -70154,6 +72923,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pandoc";
+        ename = "pandoc";
         version = "20161128.357";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -70180,6 +72950,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pandoc-mode";
+        ename = "pandoc-mode";
         version = "20180710.746";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -70204,6 +72975,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pangu-spacing";
+        ename = "pangu-spacing";
         version = "20170317.157";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -70229,6 +73001,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "paper-theme";
+        ename = "paper-theme";
         version = "20180429.1515";
         src = fetchFromGitHub {
           owner = "cadadr";
@@ -70257,6 +73030,7 @@
                              , s }:
       melpaBuild {
         pname = "paperless";
+        ename = "paperless";
         version = "20180224.445";
         src = fetchFromGitHub {
           owner = "atgreen";
@@ -70286,6 +73060,7 @@
                            , spinner }:
       melpaBuild {
         pname = "paradox";
+        ename = "paradox";
         version = "20180216.334";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -70310,6 +73085,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "paredit";
+        ename = "paredit";
         version = "20171126.1805";
         src = fetchgit {
           url = "https://mumble.net/~campbell/git/paredit.git";
@@ -70334,6 +73110,7 @@
                                       , paredit }:
       melpaBuild {
         pname = "paredit-everywhere";
+        ename = "paredit-everywhere";
         version = "20180506.149";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -70359,6 +73136,7 @@
                                 , paredit }:
       melpaBuild {
         pname = "paredit-menu";
+        ename = "paredit-menu";
         version = "20160128.933";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -70384,6 +73162,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "paren-completer";
+        ename = "paren-completer";
         version = "20160501.352";
         src = fetchFromGitHub {
           owner = "MatthewBregg";
@@ -70408,6 +73187,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "paren-face";
+        ename = "paren-face";
         version = "20180318.1325";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -70432,6 +73212,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "parent-mode";
+        ename = "parent-mode";
         version = "20150824.1600";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -70458,12 +73239,13 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parinfer";
-        version = "20180712.443";
+        ename = "parinfer";
+        version = "20180718.16";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "42c6df279e167957438d1c7d7530bdf1cc5214c1";
-          sha256 = "0rilia0nr99ngpd7bp48314mnb4353x32lxy3h0jf35slk9430vf";
+          rev = "04dd27a3f39d6dbe8e4e717a6f7dac26c9798bd8";
+          sha256 = "1n1ggfzyvnw9w3acqahiv4pnzhlmvr5rzv15m3iw35w77yki87x4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -70482,6 +73264,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "parse-csv";
+        ename = "parse-csv";
         version = "20160512.1023";
         src = fetchFromGitHub {
           owner = "mrc";
@@ -70507,6 +73290,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parsebib";
+        ename = "parsebib";
         version = "20180116.627";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -70533,6 +73317,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "parsec";
+        ename = "parsec";
         version = "20171202.2031";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -70559,6 +73344,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parseclj";
+        ename = "parseclj";
         version = "20180602.1306";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -70584,6 +73370,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pasp-mode";
+        ename = "pasp-mode";
         version = "20180404.1000";
         src = fetchFromGitHub {
           owner = "santifa";
@@ -70612,6 +73399,7 @@
                         , password-store-otp }:
       melpaBuild {
         pname = "pass";
+        ename = "pass";
         version = "20180201.451";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -70638,6 +73426,7 @@
                           , password-store }:
       melpaBuild {
         pname = "passmm";
+        ename = "passmm";
         version = "20180622.1626";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -70663,6 +73452,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "passthword";
+        ename = "passthword";
         version = "20141201.123";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -70687,6 +73477,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "password-generator";
+        ename = "password-generator";
         version = "20150222.1240";
         src = fetchFromGitHub {
           owner = "zargener";
@@ -70711,6 +73502,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "password-mode";
+        ename = "password-mode";
         version = "20170411.2329";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -70739,6 +73531,7 @@
                                   , with-editor }:
       melpaBuild {
         pname = "password-store";
+        ename = "password-store";
         version = "20170829.1633";
         src = fetchFromGitHub {
           owner = "zx2c4";
@@ -70766,6 +73559,7 @@
                                       , s }:
       melpaBuild {
         pname = "password-store-otp";
+        ename = "password-store-otp";
         version = "20170928.18";
         src = fetchFromGitHub {
           owner = "volrath";
@@ -70792,6 +73586,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "password-vault";
+        ename = "password-vault";
         version = "20160126.1020";
         src = fetchFromGitHub {
           owner = "PuercoPop";
@@ -70818,6 +73613,7 @@
                                  , request }:
       melpaBuild {
         pname = "paste-of-code";
+        ename = "paste-of-code";
         version = "20170709.1655";
         src = fetchFromGitHub {
           owner = "spebern";
@@ -70842,6 +73638,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pastebin";
+        ename = "pastebin";
         version = "20101125.1202";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -70866,6 +73663,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pastehub";
+        ename = "pastehub";
         version = "20140614.2320";
         src = fetchFromGitHub {
           owner = "kiyoka";
@@ -70891,6 +73689,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "pastelmac-theme";
+        ename = "pastelmac-theme";
         version = "20151030.1936";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -70917,6 +73716,7 @@
                            , request }:
       melpaBuild {
         pname = "pastery";
+        ename = "pastery";
         version = "20171113.1949";
         src = fetchFromGitHub {
           owner = "diasbruno";
@@ -70941,6 +73741,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "path-headerline-mode";
+        ename = "path-headerline-mode";
         version = "20140423.632";
         src = fetchFromGitHub {
           owner = "7696122";
@@ -70965,6 +73766,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pathify";
+        ename = "pathify";
         version = "20160423.146";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -70991,6 +73793,7 @@
                            , paredit }:
       melpaBuild {
         pname = "paxedit";
+        ename = "paxedit";
         version = "20160730.1027";
         src = fetchFromGitHub {
           owner = "promethial";
@@ -71015,6 +73818,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pbcopy";
+        ename = "pbcopy";
         version = "20150224.2059";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -71039,6 +73843,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pc-bufsw";
+        ename = "pc-bufsw";
         version = "20180107.1040";
         src = fetchFromGitHub {
           owner = "ibukanov";
@@ -71064,6 +73869,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pcache";
+        ename = "pcache";
         version = "20170105.1414";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -71089,6 +73895,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pcap-mode";
+        ename = "pcap-mode";
         version = "20161025.748";
         src = fetchFromGitHub {
           owner = "orgcandman";
@@ -71113,6 +73920,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pcmpl-args";
+        ename = "pcmpl-args";
         version = "20120911.2224";
         src = fetchFromGitHub {
           owner = "JonWaltman";
@@ -71137,6 +73945,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pcmpl-git";
+        ename = "pcmpl-git";
         version = "20170120.1659";
         src = fetchFromGitHub {
           owner = "leoliu";
@@ -71161,6 +73970,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "pcmpl-homebrew";
+        ename = "pcmpl-homebrew";
         version = "20170110.1609";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -71188,6 +73998,7 @@
                              , seq }:
       melpaBuild {
         pname = "pcmpl-pip";
+        ename = "pcmpl-pip";
         version = "20171201.33";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -71214,6 +74025,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "pcomplete-extension";
+        ename = "pcomplete-extension";
         version = "20180706.2155";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -71240,6 +74052,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pcre2el";
+        ename = "pcre2el";
         version = "20161120.1303";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -71264,6 +74077,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "pcsv";
+        ename = "pcsv";
         version = "20150220.331";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -71288,6 +74102,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pdb-mode";
+        ename = "pdb-mode";
         version = "20150128.951";
         src = fetchFromGitHub {
           owner = "sixpi";
@@ -71315,6 +74130,7 @@
                              , tablist }:
       melpaBuild {
         pname = "pdf-tools";
+        ename = "pdf-tools";
         version = "20180428.827";
         src = fetchFromGitHub {
           owner = "politza";
@@ -71340,6 +74156,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "peacock-theme";
+        ename = "peacock-theme";
         version = "20170808.620";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -71365,6 +74182,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "peek-mode";
+        ename = "peek-mode";
         version = "20130620.1246";
         src = fetchFromGitHub {
           owner = "erikriverson";
@@ -71389,6 +74207,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "peep-dired";
+        ename = "peep-dired";
         version = "20160321.1537";
         src = fetchFromGitHub {
           owner = "asok";
@@ -71413,6 +74232,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "peg";
+        ename = "peg";
         version = "20150707.2341";
         src = fetchFromGitHub {
           owner = "ellerh";
@@ -71438,6 +74258,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "pelican-mode";
+        ename = "pelican-mode";
         version = "20180604.1507";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/pelican-mode.git";
@@ -71462,6 +74283,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "per-buffer-theme";
+        ename = "per-buffer-theme";
         version = "20160318.1501";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/per-buffer-theme.el";
@@ -71487,6 +74309,7 @@
                               , pkg-info }:
       melpaBuild {
         pname = "perl6-mode";
+        ename = "perl6-mode";
         version = "20180619.459";
         src = fetchFromGitHub {
           owner = "perl6";
@@ -71511,6 +74334,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "perlbrew";
+        ename = "perlbrew";
         version = "20161108.2309";
         src = fetchFromGitHub {
           owner = "kentaro";
@@ -71535,6 +74359,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "persistent-overlays";
+        ename = "persistent-overlays";
         version = "20161127.2300";
         src = fetchFromGitHub {
           owner = "mneilly";
@@ -71560,6 +74385,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "persistent-scratch";
+        ename = "persistent-scratch";
         version = "20180425.1811";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -71586,6 +74412,7 @@
                                    , pcache }:
       melpaBuild {
         pname = "persistent-soft";
+        ename = "persistent-soft";
         version = "20150223.1053";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -71613,6 +74440,7 @@
                             , persp-mode }:
       melpaBuild {
         pname = "persp-fr";
+        ename = "persp-fr";
         version = "20180103.642";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -71637,6 +74465,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "persp-mode";
+        ename = "persp-mode";
         version = "20180604.1018";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
@@ -71664,6 +74493,7 @@
                                                 , projectile }:
       melpaBuild {
         pname = "persp-mode-projectile-bridge";
+        ename = "persp-mode-projectile-bridge";
         version = "20170315.420";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
@@ -71691,6 +74521,7 @@
                                     , projectile }:
       melpaBuild {
         pname = "persp-projectile";
+        ename = "persp-projectile";
         version = "20180616.1244";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -71716,12 +74547,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "perspective";
-        version = "20180614.1533";
+        ename = "perspective";
+        version = "20180717.1403";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "ca2a3b51a8411853b9adef2a9fe38011f84b91d9";
-          sha256 = "14sa0imfwhfbsm10dzack6wn4y4hdlgfr9a0gvh2hk0fd790w9v2";
+          rev = "8e2f122de408d7866136dd861d513a9575cf32e6";
+          sha256 = "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
@@ -71742,6 +74574,7 @@
                             , powerline }:
       melpaBuild {
         pname = "perspeen";
+        ename = "perspeen";
         version = "20171203.221";
         src = fetchFromGitHub {
           owner = "seudut";
@@ -71767,6 +74600,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pfuture";
+        ename = "pfuture";
         version = "20180715.524";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -71791,6 +74625,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "pg";
+        ename = "pg";
         version = "20130731.1442";
         src = fetchFromGitHub {
           owner = "cbbrowne";
@@ -71815,6 +74650,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pgdevenv";
+        ename = "pgdevenv";
         version = "20150105.1436";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -71840,6 +74676,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ph";
+        ename = "ph";
         version = "20161029.822";
         src = fetchFromGitHub {
           owner = "gromnitsky";
@@ -71869,6 +74706,7 @@
                                , s }:
       melpaBuild {
         pname = "phabricator";
+        ename = "phabricator";
         version = "20160510.725";
         src = fetchFromGitHub {
           owner = "ajtulloch";
@@ -71896,6 +74734,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "phan";
+        ename = "phan";
         version = "20180527.2039";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -71921,6 +74760,7 @@
                                 , paredit }:
       melpaBuild {
         pname = "phi-autopair";
+        ename = "phi-autopair";
         version = "20170216.1953";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -71946,6 +74786,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "phi-grep";
+        ename = "phi-grep";
         version = "20170606.107";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -71970,6 +74811,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "phi-rectangle";
+        ename = "phi-rectangle";
         version = "20151207.2254";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -71994,6 +74836,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "phi-search";
+        ename = "phi-search";
         version = "20180321.1829";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -72019,6 +74862,7 @@
                                     , phi-search }:
       melpaBuild {
         pname = "phi-search-dired";
+        ename = "phi-search-dired";
         version = "20150405.14";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -72045,6 +74889,7 @@
                                  , phi-search }:
       melpaBuild {
         pname = "phi-search-mc";
+        ename = "phi-search-mc";
         version = "20160324.803";
         src = fetchFromGitHub {
           owner = "knu";
@@ -72071,6 +74916,7 @@
                                      , phi-search }:
       melpaBuild {
         pname = "phi-search-migemo";
+        ename = "phi-search-migemo";
         version = "20170618.221";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -72095,6 +74941,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "phoenix-dark-mono-theme";
+        ename = "phoenix-dark-mono-theme";
         version = "20170729.706";
         src = fetchFromGitHub {
           owner = "j0ni";
@@ -72119,6 +74966,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "phoenix-dark-pink-theme";
+        ename = "phoenix-dark-pink-theme";
         version = "20170729.703";
         src = fetchFromGitHub {
           owner = "j0ni";
@@ -72145,6 +74993,7 @@
                                        , yasnippet }:
       melpaBuild {
         pname = "php-auto-yasnippets";
+        ename = "php-auto-yasnippets";
         version = "20170330.1814";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -72169,6 +75018,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "php-boris";
+        ename = "php-boris";
         version = "20130527.121";
         src = fetchFromGitHub {
           owner = "tomterl";
@@ -72195,6 +75045,7 @@
                                         , php-boris }:
       melpaBuild {
         pname = "php-boris-minor-mode";
+        ename = "php-boris-minor-mode";
         version = "20140209.1035";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/php-boris-minor-mode.git";
@@ -72219,6 +75070,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "php-cs-fixer";
+        ename = "php-cs-fixer";
         version = "20170506.1133";
         src = fetchFromGitHub {
           owner = "OVYA";
@@ -72243,6 +75095,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "php-eldoc";
+        ename = "php-eldoc";
         version = "20140202.1141";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -72269,6 +75122,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "php-mode";
+        ename = "php-mode";
         version = "20180608.250";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -72293,6 +75147,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "php-refactor-mode";
+        ename = "php-refactor-mode";
         version = "20171123.2235";
         src = fetchFromGitHub {
           owner = "keelerm84";
@@ -72319,6 +75174,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "php-runtime";
+        ename = "php-runtime";
         version = "20180110.934";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -72346,6 +75202,7 @@
                                , s }:
       melpaBuild {
         pname = "php-scratch";
+        ename = "php-scratch";
         version = "20161103.1517";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -72373,12 +75230,13 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "phpactor";
-        version = "20180602.554";
+        ename = "phpactor";
+        version = "20180721.1022";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpactor.el";
-          rev = "f3b0e3d1e162b4f4fcdfe512bbab793c4808b358";
-          sha256 = "1nfnj022ixy68bznh3ms7d1h53qa65jdcnlf8bv6fbd41hqfvyvg";
+          rev = "a09b2eb76228b39a9a6823dc6782e44bafc4b974";
+          sha256 = "10x999z1rlnjdvnpq4c7gf6n19a47nj954y3vbshb15d6wzxd923";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
@@ -72398,6 +75256,7 @@
                           , s }:
       melpaBuild {
         pname = "phpcbf";
+        ename = "phpcbf";
         version = "20180519.138";
         src = fetchFromGitHub {
           owner = "nishimaki10";
@@ -72423,12 +75282,13 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "phpstan";
-        version = "20180502.2006";
+        ename = "phpstan";
+        version = "20180721.1235";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpstan.el";
-          rev = "97f643518714ba3e76b5b64f72c938800b4dc43b";
-          sha256 = "02k99s6l4pppvjb089xbj7jgc983ia3jy2fj80mjpqmpbpnlakq2";
+          rev = "09102b062b607affc93f2d8a113a9fc9f9cf3016";
+          sha256 = "0n21vyvd5c42v03xcfx94dz252z3s413i0f9pwjrssq2yd3x2bgm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
@@ -72452,6 +75312,7 @@
                            , s }:
       melpaBuild {
         pname = "phpunit";
+        ename = "phpunit";
         version = "20171127.301";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -72476,6 +75337,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pianobar";
+        ename = "pianobar";
         version = "20180416.1804";
         src = fetchFromGitHub {
           owner = "agrif";
@@ -72502,6 +75364,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pickle";
+        ename = "pickle";
         version = "20180627.1937";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -72526,6 +75389,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "picolisp-mode";
+        ename = "picolisp-mode";
         version = "20150516.155";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -72551,6 +75415,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "picpocket";
+        ename = "picpocket";
         version = "20180610.359";
         src = fetchFromGitHub {
           owner = "johanclaesson";
@@ -72575,6 +75440,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pig-mode";
+        ename = "pig-mode";
         version = "20180520.700";
         src = fetchFromGitHub {
           owner = "motus";
@@ -72600,6 +75466,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "pig-snippets";
+        ename = "pig-snippets";
         version = "20130912.2324";
         src = fetchFromGitHub {
           owner = "motus";
@@ -72625,6 +75492,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pillar";
+        ename = "pillar";
         version = "20141112.1011";
         src = fetchFromGitHub {
           owner = "pillar-markup";
@@ -72649,6 +75517,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "pinboard-api";
+        ename = "pinboard-api";
         version = "20140324.448";
         src = fetchFromGitHub {
           owner = "danieroux";
@@ -72674,6 +75543,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pinboard-popular";
+        ename = "pinboard-popular";
         version = "20180511.1026";
         src = fetchFromGitHub {
           owner = "asimpson";
@@ -72698,6 +75568,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "pinot";
+        ename = "pinot";
         version = "20140211.1226";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -72724,6 +75595,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pinyin";
+        ename = "pinyin";
         version = "20180620.541";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -72749,6 +75621,7 @@
                                  , pinyinlib }:
       melpaBuild {
         pname = "pinyin-search";
+        ename = "pinyin-search";
         version = "20160514.2058";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -72773,6 +75646,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pinyinlib";
+        ename = "pinyinlib";
         version = "20170827.1442";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -72798,6 +75672,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pip-requirements";
+        ename = "pip-requirements";
         version = "20180602.1034";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -72825,12 +75700,13 @@
                           , s }:
       melpaBuild {
         pname = "pipenv";
-        version = "20180626.2323";
+        ename = "pipenv";
+        version = "20180718.2247";
         src = fetchFromGitHub {
           owner = "pwalsh";
           repo = "pipenv.el";
-          rev = "822150b56c1ab481d0c4e7e87a9a189539259ed8";
-          sha256 = "0qci4mrlvvssmis3rksawm8ki2hv550qimyk6i4shif4xvm63ys0";
+          rev = "05e98e80be2dd92f14ffb9f6048f98547a9f0253";
+          sha256 = "1gdy31nlxac1c500jpcnvgb32lcg0xfqgiiyci4s958cwn1yn704";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv";
@@ -72852,6 +75728,7 @@
                           , s }:
       melpaBuild {
         pname = "pippel";
+        ename = "pippel";
         version = "20180710.156";
         src = fetchFromGitHub {
           owner = "brotzeit";
@@ -72876,6 +75753,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "pivotal-tracker";
+        ename = "pivotal-tracker";
         version = "20170720.816";
         src = fetchFromGitHub {
           owner = "jxa";
@@ -72902,6 +75780,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pixie-mode";
+        ename = "pixie-mode";
         version = "20180625.2241";
         src = fetchFromGitHub {
           owner = "johnwalker";
@@ -72926,6 +75805,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pixiv-novel-mode";
+        ename = "pixiv-novel-mode";
         version = "20160220.621";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -72951,6 +75831,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pkg-info";
+        ename = "pkg-info";
         version = "20150517.443";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -72976,6 +75857,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pkgbuild-mode";
+        ename = "pkgbuild-mode";
         version = "20180609.931";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -73001,6 +75883,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "plain-theme";
+        ename = "plain-theme";
         version = "20171123.2010";
         src = fetchFromGitLab {
           owner = "yegortimoshenko";
@@ -73025,6 +75908,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "plan9-theme";
+        ename = "plan9-theme";
         version = "20180606.2035";
         src = fetchFromGitHub {
           owner = "john2x";
@@ -73050,6 +75934,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "planet-theme";
+        ename = "planet-theme";
         version = "20161030.1917";
         src = fetchFromGitHub {
           owner = "cmack";
@@ -73074,6 +75959,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "plantuml-mode";
+        ename = "plantuml-mode";
         version = "20170819.1033";
         src = fetchFromGitHub {
           owner = "skuro";
@@ -73099,6 +75985,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "plaster";
+        ename = "plaster";
         version = "20180127.1250";
         src = fetchFromGitHub {
           owner = "Shirakumo";
@@ -73124,6 +76011,7 @@
                                    , projectile }:
       melpaBuild {
         pname = "platformio-mode";
+        ename = "platformio-mode";
         version = "20161210.539";
         src = fetchFromGitHub {
           owner = "ZachMassia";
@@ -73151,6 +76039,7 @@
                                 , request }:
       melpaBuild {
         pname = "play-crystal";
+        ename = "play-crystal";
         version = "20180114.224";
         src = fetchFromGitHub {
           owner = "veelenga";
@@ -73175,6 +76064,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "play-routes-mode";
+        ename = "play-routes-mode";
         version = "20170426.33";
         src = fetchFromGitHub {
           owner = "brocode";
@@ -73199,6 +76089,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "playerctl";
+        ename = "playerctl";
         version = "20180301.554";
         src = fetchFromGitHub {
           owner = "thomasluquet";
@@ -73224,6 +76115,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "playground";
+        ename = "playground";
         version = "20180623.2026";
         src = fetchFromGitHub {
           owner = "akirak";
@@ -73248,6 +76140,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "plenv";
+        ename = "plenv";
         version = "20130706.2316";
         src = fetchFromGitHub {
           owner = "karupanerura";
@@ -73272,6 +76165,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "plim-mode";
+        ename = "plim-mode";
         version = "20140812.1713";
         src = fetchFromGitHub {
           owner = "dongweiming";
@@ -73299,6 +76193,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "plsense";
+        ename = "plsense";
         version = "20151104.645";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -73327,6 +76222,7 @@
                                  , yaxception }:
       melpaBuild {
         pname = "plsense-direx";
+        ename = "plsense-direx";
         version = "20140520.1308";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -73352,6 +76248,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "plur";
+        ename = "plur";
         version = "20160504.224";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -73376,6 +76273,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "pmdm";
+        ename = "pmdm";
         version = "20151109.1036";
         src = fetchhg {
           url = "https://bitbucket.com/inigoserna/pmdm.el";
@@ -73399,6 +76297,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "po-mode";
+        ename = "po-mode";
         version = "20180505.415";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
@@ -73424,6 +76323,7 @@
                               , request }:
       melpaBuild {
         pname = "pocket-api";
+        ename = "pocket-api";
         version = "20180402.1809";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -73453,6 +76353,7 @@
                               , s }:
       melpaBuild {
         pname = "pocket-lib";
+        ename = "pocket-lib";
         version = "20180711.1723";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -73479,6 +76380,7 @@
                                , pocket-api }:
       melpaBuild {
         pname = "pocket-mode";
+        ename = "pocket-mode";
         version = "20171201.515";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -73512,12 +76414,13 @@
                                  , s }:
       melpaBuild {
         pname = "pocket-reader";
-        version = "20180709.130";
+        ename = "pocket-reader";
+        version = "20180719.1453";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-reader.el";
-          rev = "78ab8dac82824965ac47c5d2cc00fcd2e64f8705";
-          sha256 = "10kw7n9ghqxdf1h00i61m68c0dav2zpmzln1ph1fgizc41x7j4aa";
+          rev = "baef400c607cb192fac9157d3f6ce5e1573628bd";
+          sha256 = "12j1za5d98svll26xi8igxk0zh8vz4i0bbscx8m39gn0grh5kmnb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@@ -73547,6 +76450,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "podcaster";
+        ename = "podcaster";
         version = "20161020.835";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -73571,6 +76475,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "poet-theme";
+        ename = "poet-theme";
         version = "20180603.1523";
         src = fetchFromGitHub {
           owner = "kunalb";
@@ -73595,6 +76500,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "point-pos";
+        ename = "point-pos";
         version = "20170421.932";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -73619,6 +76525,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "point-stack";
+        ename = "point-stack";
         version = "20170808.958";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -73643,6 +76550,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pointback";
+        ename = "pointback";
         version = "20100210.752";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -73669,6 +76577,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pollen-mode";
+        ename = "pollen-mode";
         version = "20180404.612";
         src = fetchFromGitHub {
           owner = "lijunsong";
@@ -73695,6 +76604,7 @@
                              , polymode }:
       melpaBuild {
         pname = "poly-ruby";
+        ename = "poly-ruby";
         version = "20170802.648";
         src = fetchFromGitHub {
           owner = "knu";
@@ -73720,6 +76630,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "polymode";
+        ename = "polymode";
         version = "20170307.322";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -73746,6 +76657,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pomidor";
+        ename = "pomidor";
         version = "20180614.128";
         src = fetchFromGitHub {
           owner = "TatriX";
@@ -73770,6 +76682,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pomodoro";
+        ename = "pomodoro";
         version = "20150716.1046";
         src = fetchFromGitHub {
           owner = "baudtack";
@@ -73794,6 +76707,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pony-mode";
+        ename = "pony-mode";
         version = "20170807.822";
         src = fetchFromGitHub {
           owner = "davidmiller";
@@ -73819,6 +76733,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "pony-snippets";
+        ename = "pony-snippets";
         version = "20160204.2011";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -73844,6 +76759,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ponylang-mode";
+        ename = "ponylang-mode";
         version = "20171028.1356";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -73870,6 +76786,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "pophint";
+        ename = "pophint";
         version = "20170917.1948";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -73894,6 +76811,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "poporg";
+        ename = "poporg";
         version = "20170403.51";
         src = fetchFromGitHub {
           owner = "QBobWatson";
@@ -73919,6 +76837,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "popup";
+        ename = "popup";
         version = "20160709.729";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -73944,6 +76863,7 @@
                                   , popup }:
       melpaBuild {
         pname = "popup-complete";
+        ename = "popup-complete";
         version = "20141108.1908";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -73969,6 +76889,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "popup-edit-menu";
+        ename = "popup-edit-menu";
         version = "20170404.725";
         src = fetchFromGitHub {
           owner = "debugfan";
@@ -73996,6 +76917,7 @@
                                , popup }:
       melpaBuild {
         pname = "popup-imenu";
+        ename = "popup-imenu";
         version = "20170326.340";
         src = fetchFromGitHub {
           owner = "ancane";
@@ -74022,6 +76944,7 @@
                                    , pos-tip }:
       melpaBuild {
         pname = "popup-kill-ring";
+        ename = "popup-kill-ring";
         version = "20131020.1154";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -74048,6 +76971,7 @@
                                   , popup }:
       melpaBuild {
         pname = "popup-switcher";
+        ename = "popup-switcher";
         version = "20171205.51";
         src = fetchFromGitHub {
           owner = "kostafey";
@@ -74072,6 +76996,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "popwin";
+        ename = "popwin";
         version = "20150315.600";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -74098,6 +77023,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "portage-navi";
+        ename = "portage-navi";
         version = "20141208.555";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -74122,6 +77048,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pos-tip";
+        ename = "pos-tip";
         version = "20150318.813";
         src = fetchFromGitHub {
           owner = "pitkali";
@@ -74147,6 +77074,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "posframe";
+        ename = "posframe";
         version = "20180708.702";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -74172,6 +77100,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "postcss-sorting";
+        ename = "postcss-sorting";
         version = "20180211.156";
         src = fetchFromGitHub {
           owner = "P233";
@@ -74196,6 +77125,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pov-mode";
+        ename = "pov-mode";
         version = "20161114.2343";
         src = fetchFromGitHub {
           owner = "melmothx";
@@ -74222,6 +77152,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "pow";
+        ename = "pow";
         version = "20140420.106";
         src = fetchFromGitHub {
           owner = "yukihr";
@@ -74247,6 +77178,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "powerline";
+        ename = "powerline";
         version = "20180321.1948";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -74273,6 +77205,7 @@
                                   , powerline }:
       melpaBuild {
         pname = "powerline-evil";
+        ename = "powerline-evil";
         version = "20151112.710";
         src = fetchFromGitHub {
           owner = "raugturi";
@@ -74298,6 +77231,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "powershell";
+        ename = "powershell";
         version = "20180616.2328";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -74325,12 +77259,13 @@
                                   , s }:
       melpaBuild {
         pname = "powerthesaurus";
-        version = "20180612.447";
+        ename = "powerthesaurus";
+        version = "20180719.208";
         src = fetchFromGitHub {
           owner = "SavchenkoValeriy";
           repo = "emacs-powerthesaurus";
-          rev = "98741b99d12cef707fa8d6581d1de4aee6212de8";
-          sha256 = "1rr0mv7adrn6qmfqixgfpamz31sq9nbvyi2raxhkrmj072mf5535";
+          rev = "ab39b050e801934872f3dcaa60b50b0d30ecf367";
+          sha256 = "0l4rny6ssa5wmksc0g1qnyfj15qlffavflm2adcqywr660d93pq9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04a7e6d2292e933e0318296107774e1248888f3c/recipes/powerthesaurus";
@@ -74351,6 +77286,7 @@
                                    , sr-speedbar }:
       melpaBuild {
         pname = "ppd-sr-speedbar";
+        ename = "ppd-sr-speedbar";
         version = "20151108.424";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -74376,6 +77312,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "prassee-theme";
+        ename = "prassee-theme";
         version = "20180709.304";
         src = fetchFromGitHub {
           owner = "prassee";
@@ -74400,6 +77337,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "preproc-font-lock";
+        ename = "preproc-font-lock";
         version = "20151107.1218";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -74425,6 +77363,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prescient";
+        ename = "prescient";
         version = "20180702.1140";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -74449,6 +77388,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "preseed-generic-mode";
+        ename = "preseed-generic-mode";
         version = "20180209.2100";
         src = fetchFromGitHub {
           owner = "suntong";
@@ -74475,6 +77415,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "presentation";
+        ename = "presentation";
         version = "20180426.1924";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -74499,6 +77440,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "prettier-js";
+        ename = "prettier-js";
         version = "20180108.2326";
         src = fetchFromGitHub {
           owner = "prettier";
@@ -74523,6 +77465,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "prettify-greek";
+        ename = "prettify-greek";
         version = "20160603.208";
         src = fetchFromGitLab {
           owner = "fommil";
@@ -74547,6 +77490,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pretty-mode";
+        ename = "pretty-mode";
         version = "20160614.1146";
         src = fetchFromGitHub {
           owner = "akatov";
@@ -74571,6 +77515,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "pretty-sha-path";
+        ename = "pretty-sha-path";
         version = "20141105.1026";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -74595,6 +77540,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "pretty-symbols";
+        ename = "pretty-symbols";
         version = "20140814.259";
         src = fetchFromGitHub {
           owner = "drothlis";
@@ -74620,6 +77566,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "private";
+        ename = "private";
         version = "20150121.1757";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -74645,6 +77592,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "private-diary";
+        ename = "private-diary";
         version = "20151216.857";
         src = fetchFromGitHub {
           owner = "cacology";
@@ -74669,6 +77617,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "proc-net";
+        ename = "proc-net";
         version = "20130321.1712";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -74693,6 +77642,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "processing-mode";
+        ename = "processing-mode";
         version = "20171022.1602";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -74718,6 +77668,7 @@
                                        , yasnippet }:
       melpaBuild {
         pname = "processing-snippets";
+        ename = "processing-snippets";
         version = "20140426.728";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -74746,6 +77697,7 @@
                            , s }:
       melpaBuild {
         pname = "prodigy";
+        ename = "prodigy";
         version = "20180511.238";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -74770,6 +77722,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "professional-theme";
+        ename = "professional-theme";
         version = "20150315.400";
         src = fetchFromGitHub {
           owner = "juanjux";
@@ -74796,6 +77749,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prog-fill";
+        ename = "prog-fill";
         version = "20180606.1832";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -74820,6 +77774,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "prognth";
+        ename = "prognth";
         version = "20130920.1059";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -74844,6 +77799,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "programmer-dvorak";
+        ename = "programmer-dvorak";
         version = "20150426.1837";
         src = fetchFromGitHub {
           owner = "yangchenyun";
@@ -74869,6 +77825,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "project-abbrev";
+        ename = "project-abbrev";
         version = "20180705.1954";
         src = fetchFromGitHub {
           owner = "jcs090218";
@@ -74897,6 +77854,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "project-explorer";
+        ename = "project-explorer";
         version = "20150503.1714";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -74921,6 +77879,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "project-persist";
+        ename = "project-persist";
         version = "20150519.1324";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -74946,6 +77905,7 @@
                                           , project-persist }:
       melpaBuild {
         pname = "project-persist-drawer";
+        ename = "project-persist-drawer";
         version = "20151108.422";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -74970,6 +77930,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "project-root";
+        ename = "project-root";
         version = "20110206.1230";
         src = fetchhg {
           url = "https://bitbucket.com/piranha/project-root";
@@ -74995,6 +77956,7 @@
                                   , seq }:
       melpaBuild {
         pname = "project-shells";
+        ename = "project-shells";
         version = "20171107.51";
         src = fetchFromGitHub {
           owner = "hying-caritas";
@@ -75021,12 +77983,13 @@
                               , pkg-info }:
       melpaBuild {
         pname = "projectile";
-        version = "20180711.102";
+        ename = "projectile";
+        version = "20180721.352";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "10aefe821c03c430d10e1408966938c066bbf49b";
-          sha256 = "1haxwsgsi98mfwyxg4v3rkz4i5k50swinrq0cfgfkgc1hkx39m8c";
+          rev = "06f7148ad5168476879c11dcacc02e76439a0226";
+          sha256 = "167libx4b0xgnrz5xafbpylig4jmmn4dmqwqqcrf9953p37pn8ga";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -75047,6 +78010,7 @@
                                          , projectile }:
       melpaBuild {
         pname = "projectile-codesearch";
+        ename = "projectile-codesearch";
         version = "20180508.822";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -75075,6 +78039,7 @@
                                      , s }:
       melpaBuild {
         pname = "projectile-direnv";
+        ename = "projectile-direnv";
         version = "20160305.1738";
         src = fetchFromGitHub {
           owner = "christianromney";
@@ -75101,6 +78066,7 @@
                                             , projectile }:
       melpaBuild {
         pname = "projectile-git-autofetch";
+        ename = "projectile-git-autofetch";
         version = "20180418.1636";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -75129,6 +78095,7 @@
                                      , rake }:
       melpaBuild {
         pname = "projectile-hanami";
+        ename = "projectile-hanami";
         version = "20160505.611";
         src = fetchFromGitHub {
           owner = "avdgaag";
@@ -75159,12 +78126,13 @@
                                     , rake }:
       melpaBuild {
         pname = "projectile-rails";
-        version = "20180618.804";
+        ename = "projectile-rails";
+        version = "20180718.55";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "ab97a5ceb06d6028ccdc74b97c1c22d3eb874921";
-          sha256 = "01liqmhcjp3mkj41i6b00s2164xlqymvddm7m7gmhnmd2ivhsvzv";
+          rev = "38fa072fe2d63890a439cc29a19671da39e975bd";
+          sha256 = "17fj0qmxnbj48d2mnpz0dw2060whi29b8d2qb9sa9irrwfb63ayw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -75185,6 +78153,7 @@
                                       , ripgrep }:
       melpaBuild {
         pname = "projectile-ripgrep";
+        ename = "projectile-ripgrep";
         version = "20180301.651";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -75211,6 +78180,7 @@
                                    , sift }:
       melpaBuild {
         pname = "projectile-sift";
+        ename = "projectile-sift";
         version = "20160107.215";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -75237,6 +78207,7 @@
                                        , sr-speedbar }:
       melpaBuild {
         pname = "projectile-speedbar";
+        ename = "projectile-speedbar";
         version = "20170516.1943";
         src = fetchFromGitHub {
           owner = "anshulverma";
@@ -75267,6 +78238,7 @@
                                           , rake }:
       melpaBuild {
         pname = "projectile-trailblazer";
+        ename = "projectile-trailblazer";
         version = "20170928.924";
         src = fetchFromGitHub {
           owner = "micdahl";
@@ -75293,6 +78265,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "projectile-variable";
+        ename = "projectile-variable";
         version = "20170208.918";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -75320,6 +78293,7 @@
                              , projectile }:
       melpaBuild {
         pname = "projector";
+        ename = "projector";
         version = "20180712.1549";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -75345,6 +78319,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "projekt";
+        ename = "projekt";
         version = "20150324.148";
         src = fetchFromGitHub {
           owner = "tekai";
@@ -75371,6 +78346,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "projmake-mode";
+        ename = "projmake-mode";
         version = "20161031.1015";
         src = fetchFromGitHub {
           owner = "ericbmerritt";
@@ -75397,6 +78373,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "promise";
+        ename = "promise";
         version = "20180409.252";
         src = fetchFromGitHub {
           owner = "chuntaro";
@@ -75421,6 +78398,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "prompt-text";
+        ename = "prompt-text";
         version = "20160106.609";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -75446,6 +78424,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "prompts";
+        ename = "prompts";
         version = "20160916.341";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -75472,6 +78451,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prop-menu";
+        ename = "prop-menu";
         version = "20150728.418";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -75498,6 +78478,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "propfont-mixed";
+        ename = "propfont-mixed";
         version = "20150113.1411";
         src = fetchFromGitHub {
           owner = "ikirill";
@@ -75523,6 +78504,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "proportional";
+        ename = "proportional";
         version = "20171025.1637";
         src = fetchFromGitHub {
           owner = "ksjogo";
@@ -75548,6 +78530,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "prosjekt";
+        ename = "prosjekt";
         version = "20151127.616";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -75572,6 +78555,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "protobuf-mode";
+        ename = "protobuf-mode";
         version = "20170526.950";
         src = fetchFromGitHub {
           owner = "google";
@@ -75597,6 +78581,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "protocols";
+        ename = "protocols";
         version = "20170802.432";
         src = fetchFromGitHub {
           owner = "davep";
@@ -75622,6 +78607,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "proxy-mode";
+        ename = "proxy-mode";
         version = "20180520.2030";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -75655,6 +78641,7 @@
                            , seq }:
       melpaBuild {
         pname = "psc-ide";
+        ename = "psc-ide";
         version = "20180605.302";
         src = fetchFromGitHub {
           owner = "epost";
@@ -75693,6 +78680,7 @@
                         , s }:
       melpaBuild {
         pname = "psci";
+        ename = "psci";
         version = "20180418.533";
         src = fetchFromGitHub {
           owner = "purescript-emacs";
@@ -75720,6 +78708,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "psession";
+        ename = "psession";
         version = "20180423.2159";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -75747,6 +78736,7 @@
                          , s }:
       melpaBuild {
         pname = "psysh";
+        ename = "psysh";
         version = "20171022.2229";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -75771,6 +78761,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "pt";
+        ename = "pt";
         version = "20161226.1159";
         src = fetchFromGitHub {
           owner = "bling";
@@ -75797,6 +78788,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pug-mode";
+        ename = "pug-mode";
         version = "20180513.1426";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -75821,6 +78813,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "pulseaudio-control";
+        ename = "pulseaudio-control";
         version = "20180627.450";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -75845,6 +78838,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "punctuality-logger";
+        ename = "punctuality-logger";
         version = "20141120.1231";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -75871,6 +78865,7 @@
                          , pyvenv }:
       melpaBuild {
         pname = "pungi";
+        ename = "pungi";
         version = "20150222.446";
         src = fetchFromGitHub {
           owner = "mgrbyte";
@@ -75895,6 +78890,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "punpun-theme";
+        ename = "punpun-theme";
         version = "20161103.147";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -75921,6 +78917,7 @@
                                , pkg-info }:
       melpaBuild {
         pname = "puppet-mode";
+        ename = "puppet-mode";
         version = "20171220.2249";
         src = fetchFromGitHub {
           owner = "voxpupuli";
@@ -75945,6 +78942,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "purescript-mode";
+        ename = "purescript-mode";
         version = "20180120.709";
         src = fetchFromGitHub {
           owner = "dysinger";
@@ -75970,6 +78968,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "purple-haze-theme";
+        ename = "purple-haze-theme";
         version = "20141014.1929";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -75994,6 +78993,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "purty-mode";
+        ename = "purty-mode";
         version = "20131004.1559";
         src = fetchFromGitHub {
           owner = "jcatw";
@@ -76020,6 +79020,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pushbullet";
+        ename = "pushbullet";
         version = "20140809.532";
         src = fetchFromGitHub {
           owner = "theanalyst";
@@ -76045,6 +79046,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pushover";
+        ename = "pushover";
         version = "20170818.1403";
         src = fetchgit {
           url = "https://git.flintfam.org/swf-projects/emacs-pushover.git";
@@ -76068,6 +79070,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "px";
+        ename = "px";
         version = "20170317.1630";
         src = fetchFromGitHub {
           owner = "aaptel";
@@ -76092,6 +79095,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "py-autopep8";
+        ename = "py-autopep8";
         version = "20160925.352";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -76116,6 +79120,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "py-gnitset";
+        ename = "py-gnitset";
         version = "20170821.1032";
         src = fetchFromGitHub {
           owner = "quodlibetor";
@@ -76140,6 +79145,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "py-import-check";
+        ename = "py-import-check";
         version = "20130802.411";
         src = fetchFromGitHub {
           owner = "psibi";
@@ -76164,6 +79170,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "py-isort";
+        ename = "py-isort";
         version = "20160925.318";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -76189,6 +79196,7 @@
                                      , s }:
       melpaBuild {
         pname = "py-smart-operator";
+        ename = "py-smart-operator";
         version = "20170531.509";
         src = fetchFromGitHub {
           owner = "rmuslimov";
@@ -76216,6 +79224,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "py-test";
+        ename = "py-test";
         version = "20151116.2222";
         src = fetchFromGitHub {
           owner = "Bogdanp";
@@ -76240,6 +79249,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "py-yapf";
+        ename = "py-yapf";
         version = "20160925.422";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -76266,6 +79276,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pycarddavel";
+        ename = "pycarddavel";
         version = "20150831.516";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -76291,6 +79302,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pycoverage";
+        ename = "pycoverage";
         version = "20160324.1812";
         src = fetchFromGitHub {
           owner = "mattharrison";
@@ -76315,6 +79327,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "pydoc";
+        ename = "pydoc";
         version = "20180509.1519";
         src = fetchFromGitHub {
           owner = "statmobile";
@@ -76339,6 +79352,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pydoc-info";
+        ename = "pydoc-info";
         version = "20110301.34";
         src = fetchhg {
           url = "https://bitbucket.com/jonwaltman/pydoc-info";
@@ -76363,6 +79377,7 @@
                               , pythonic }:
       melpaBuild {
         pname = "pyenv-mode";
+        ename = "pyenv-mode";
         version = "20170801.1648";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -76390,6 +79405,7 @@
                                    , s }:
       melpaBuild {
         pname = "pyenv-mode-auto";
+        ename = "pyenv-mode-auto";
         version = "20180620.552";
         src = fetchFromGitHub {
           owner = "ssbb";
@@ -76414,6 +79430,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "pyfmt";
+        ename = "pyfmt";
         version = "20150521.1356";
         src = fetchFromGitHub {
           owner = "aheaume";
@@ -76441,6 +79458,7 @@
                          , python-mode }:
       melpaBuild {
         pname = "pygen";
+        ename = "pygen";
         version = "20161120.2106";
         src = fetchFromGitHub {
           owner = "JackCrawley";
@@ -76469,6 +79487,7 @@
                         , pyim-basedict }:
       melpaBuild {
         pname = "pyim";
+        ename = "pyim";
         version = "20180712.640";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -76493,6 +79512,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pyim-basedict";
+        ename = "pyim-basedict";
         version = "20170726.1959";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -76518,6 +79538,7 @@
                                      , pyim }:
       melpaBuild {
         pname = "pyim-cangjie5dict";
+        ename = "pyim-cangjie5dict";
         version = "20170729.1946";
         src = fetchFromGitHub {
           owner = "erstern";
@@ -76543,6 +79564,7 @@
                                , pyim }:
       melpaBuild {
         pname = "pyim-wbdict";
+        ename = "pyim-wbdict";
         version = "20170724.1527";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -76570,6 +79592,7 @@
                             , shut-up }:
       melpaBuild {
         pname = "pyimport";
+        ename = "pyimport";
         version = "20180308.952";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -76595,6 +79618,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pyimpsort";
+        ename = "pyimpsort";
         version = "20160129.2053";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -76619,6 +79643,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pylint";
+        ename = "pylint";
         version = "20170402.555";
         src = fetchFromGitHub {
           owner = "PyCQA";
@@ -76647,6 +79672,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "pynt";
+        ename = "pynt";
         version = "20180710.26";
         src = fetchFromGitHub {
           owner = "ebanner";
@@ -76674,12 +79700,13 @@
                            , tablist }:
       melpaBuild {
         pname = "pyramid";
-        version = "20180630.1446";
+        ename = "pyramid";
+        version = "20180718.1420";
         src = fetchFromGitHub {
           owner = "dakra";
           repo = "pyramid.el";
-          rev = "869eb7cbb0505f62ff5e9784061b7a7d7a54ecfb";
-          sha256 = "18a7dcf7aw66fxajr1h19vgwybdwdral69v1k83fy8xvf3rm6lla";
+          rev = "63b7ce47d3f79c8fdd06ea0cbdb519ae3e481aea";
+          sha256 = "0al7sk1kj8czffxsc5dfhnpx7wh1iwxb3a3wx8ghgkgj5iw1y466";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f786a47c2a6243c693163680146606c71502d0be/recipes/pyramid";
@@ -76699,6 +79726,7 @@
                           , s }:
       melpaBuild {
         pname = "pytest";
+        ename = "pytest";
         version = "20170614.745";
         src = fetchFromGitHub {
           owner = "ionrock";
@@ -76723,6 +79751,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "python-cell";
+        ename = "python-cell";
         version = "20131029.1616";
         src = fetchFromGitHub {
           owner = "thisch";
@@ -76747,6 +79776,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "python-django";
+        ename = "python-django";
         version = "20150821.2104";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -76771,6 +79801,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "python-docstring";
+        ename = "python-docstring";
         version = "20170508.156";
         src = fetchFromGitHub {
           owner = "glyph";
@@ -76796,6 +79827,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "python-environment";
+        ename = "python-environment";
         version = "20150310.153";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -76820,6 +79852,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "python-info";
+        ename = "python-info";
         version = "20151228.1052";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -76844,12 +79877,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "python-mode";
-        version = "20180713.32";
+        ename = "python-mode";
+        version = "20180721.1147";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "8f8ae070ac98e508e0ca0a98eeb05a77bda0156e";
-          sha256 = "0r02gi9ddbsbs41fvp93a0ng8a6a2m35x2m5fmkdx7bqpv3i4255";
+          rev = "acb7714fd24ce06e1800fb955d547d367c64439d";
+          sha256 = "1bmd0qc7qbzpxfg0wj4fs4qmdqdjar2zn8ljgr845j7qbxd0hcav";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -76874,6 +79908,7 @@
                                  , s }:
       melpaBuild {
         pname = "python-pytest";
+        ename = "python-pytest";
         version = "20180614.253";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -76906,6 +79941,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "python-switch-quotes";
+        ename = "python-switch-quotes";
         version = "20161228.9";
         src = fetchFromGitHub {
           owner = "werehuman";
@@ -76931,6 +79967,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "python-test";
+        ename = "python-test";
         version = "20171112.2137";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -76958,6 +79995,7 @@
                             , python ? null }:
       melpaBuild {
         pname = "python-x";
+        ename = "python-x";
         version = "20180218.1447";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -76985,6 +80023,7 @@
                             , s }:
       melpaBuild {
         pname = "pythonic";
+        ename = "pythonic";
         version = "20180624.2212";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -77009,12 +80048,13 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pyvenv";
-        version = "20180629.514";
+        ename = "pyvenv";
+        version = "20180720.214";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "c1123def7e0d9da57d034d3a6bd3044a738aa8db";
-          sha256 = "0mi86m5z3hig65yd0k224wx6x9i0nz9fcv91njy0ypifxh5hcd8v";
+          rev = "5824c8986bc3d21b1b0ab6a00d396bedbe1506b2";
+          sha256 = "0qdaxfl6bhxg41r6fhpqwzjrxmjnp7pznrk1r3zfyris60ih91cq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -77035,6 +80075,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "qiita";
+        ename = "qiita";
         version = "20140118.44";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -77060,6 +80101,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ql";
+        ename = "ql";
         version = "20180418.1320";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -77084,6 +80126,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "qml-mode";
+        ename = "qml-mode";
         version = "20161015.1731";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -77109,6 +80152,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "qt-pro-mode";
+        ename = "qt-pro-mode";
         version = "20170604.1141";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -77133,6 +80177,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "quasi-monochrome-theme";
+        ename = "quasi-monochrome-theme";
         version = "20180516.813";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -77158,6 +80203,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "quelpa";
+        ename = "quelpa";
         version = "20180711.1338";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/quelpa.git";
@@ -77184,6 +80230,7 @@
                                       , use-package }:
       melpaBuild {
         pname = "quelpa-use-package";
+        ename = "quelpa-use-package";
         version = "20180617.2356";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/quelpa-use-package.git";
@@ -77207,6 +80254,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "quick-buffer-switch";
+        ename = "quick-buffer-switch";
         version = "20151007.1508";
         src = fetchFromGitHub {
           owner = "renard";
@@ -77232,6 +80280,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "quick-peek";
+        ename = "quick-peek";
         version = "20180525.711";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -77256,6 +80305,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "quick-preview";
+        ename = "quick-preview";
         version = "20150828.2139";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -77281,6 +80331,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "quick-shell-keybind";
+        ename = "quick-shell-keybind";
         version = "20171022.2313";
         src = fetchFromGitHub {
           owner = "eyeinsky";
@@ -77307,6 +80358,7 @@
                             , s }:
       melpaBuild {
         pname = "quickref";
+        ename = "quickref";
         version = "20170817.532";
         src = fetchFromGitHub {
           owner = "pd";
@@ -77332,6 +80384,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "quickrun";
+        ename = "quickrun";
         version = "20170222.1715";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -77356,6 +80409,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "quiet";
+        ename = "quiet";
         version = "20160508.556";
         src = fetchFromGitHub {
           owner = "zzkt";
@@ -77382,6 +80436,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "quiz";
+        ename = "quiz";
         version = "20170818.415";
         src = fetchFromGitHub {
           owner = "davep";
@@ -77408,6 +80463,7 @@
                              , yasnippet }:
       melpaBuild {
         pname = "r-autoyas";
+        ename = "r-autoyas";
         version = "20140101.710";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -77438,6 +80494,7 @@
                          , s }:
       melpaBuild {
         pname = "racer";
+        ename = "racer";
         version = "20180708.2325";
         src = fetchFromGitHub {
           owner = "racer-rust";
@@ -77465,12 +80522,13 @@
                                , s }:
       melpaBuild {
         pname = "racket-mode";
-        version = "20180629.1144";
+        ename = "racket-mode";
+        version = "20180719.854";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "ee11689a50c72aabd59ab2cabeac2d803d16417d";
-          sha256 = "1h0gn5bypcq6h5p22grqmh4zv8dzg4apjafpnxbhyd7fb10rbd0a";
+          rev = "0f75097771a8ad9b9356c915ba877353aff1e7f6";
+          sha256 = "0ms31sjxxww93j0f731ww7yj3adl2scpr3m1zx4w5094mi69babg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -77489,6 +80547,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rails-log-mode";
+        ename = "rails-log-mode";
         version = "20140407.2125";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -77513,6 +80572,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "railscasts-reloaded-theme";
+        ename = "railscasts-reloaded-theme";
         version = "20180131.2246";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
@@ -77537,6 +80597,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "railscasts-theme";
+        ename = "railscasts-theme";
         version = "20150219.725";
         src = fetchFromGitHub {
           owner = "mikenichols";
@@ -77561,6 +80622,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rainbow-blocks";
+        ename = "rainbow-blocks";
         version = "20171025.738";
         src = fetchFromGitHub {
           owner = "istib";
@@ -77585,6 +80647,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "rainbow-delimiters";
+        ename = "rainbow-delimiters";
         version = "20170929.432";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -77610,6 +80673,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "rainbow-identifiers";
+        ename = "rainbow-identifiers";
         version = "20141102.726";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -77637,6 +80701,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rake";
+        ename = "rake";
         version = "20180212.208";
         src = fetchFromGitHub {
           owner = "asok";
@@ -77662,6 +80727,7 @@
                               , popwin }:
       melpaBuild {
         pname = "rally-mode";
+        ename = "rally-mode";
         version = "20161113.1954";
         src = fetchFromGitHub {
           owner = "seanleblanc";
@@ -77687,6 +80753,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rand-theme";
+        ename = "rand-theme";
         version = "20151219.1535";
         src = fetchFromGitHub {
           owner = "gopar";
@@ -77711,6 +80778,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "random-splash-image";
+        ename = "random-splash-image";
         version = "20151002.1830";
         src = fetchFromGitHub {
           owner = "kakakaya";
@@ -77736,6 +80804,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ranger";
+        ename = "ranger";
         version = "20170817.857";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -77760,6 +80829,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rase";
+        ename = "rase";
         version = "20120928.1345";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -77787,6 +80857,7 @@
                         , s }:
       melpaBuild {
         pname = "rats";
+        ename = "rats";
         version = "20170818.313";
         src = fetchFromGitHub {
           owner = "ane";
@@ -77811,6 +80882,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rbenv";
+        ename = "rbenv";
         version = "20141119.2349";
         src = fetchFromGitHub {
           owner = "senny";
@@ -77837,6 +80909,7 @@
                        , popup }:
       melpaBuild {
         pname = "rbt";
+        ename = "rbt";
         version = "20170202.1502";
         src = fetchFromGitHub {
           owner = "joeheyming";
@@ -77861,6 +80934,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "rc-mode";
+        ename = "rc-mode";
         version = "20160913.1218";
         src = fetchFromGitHub {
           owner = "mrhmouse";
@@ -77885,6 +80959,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "rcirc-alert";
+        ename = "rcirc-alert";
         version = "20141127.247";
         src = fetchFromGitHub {
           owner = "csantosb";
@@ -77910,6 +80985,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rcirc-alertify";
+        ename = "rcirc-alertify";
         version = "20140406.1819";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -77934,6 +81010,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "rcirc-groups";
+        ename = "rcirc-groups";
         version = "20170731.1401";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -77958,6 +81035,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "rcirc-notify";
+        ename = "rcirc-notify";
         version = "20150219.1404";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -77983,6 +81061,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "rcirc-styles";
+        ename = "rcirc-styles";
         version = "20160206.1850";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -78007,6 +81086,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rdf-prefix";
+        ename = "rdf-prefix";
         version = "20180127.1006";
         src = fetchFromGitHub {
           owner = "simenheg";
@@ -78031,6 +81111,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "rdp";
+        ename = "rdp";
         version = "20120928.1854";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -78055,6 +81136,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rdxmk";
+        ename = "rdxmk";
         version = "20170629.1834";
         src = fetchFromGitHub {
           owner = "jsalzbergedu";
@@ -78080,6 +81162,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "react-snippets";
+        ename = "react-snippets";
         version = "20170803.1550";
         src = fetchFromGitHub {
           owner = "johnmastro";
@@ -78105,6 +81188,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "read-aloud";
+        ename = "read-aloud";
         version = "20160922.2200";
         src = fetchFromGitHub {
           owner = "gromnitsky";
@@ -78132,6 +81216,7 @@
                                , ov }:
       melpaBuild {
         pname = "readability";
+        ename = "readability";
         version = "20140715.1727";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -78156,6 +81241,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "readline-complete";
+        ename = "readline-complete";
         version = "20150708.737";
         src = fetchFromGitHub {
           owner = "monsanto";
@@ -78180,6 +81266,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "real-auto-save";
+        ename = "real-auto-save";
         version = "20180107.1850";
         src = fetchFromGitHub {
           owner = "chillaranand";
@@ -78209,6 +81296,7 @@
                            , test-simple }:
       melpaBuild {
         pname = "realgud";
+        ename = "realgud";
         version = "20180710.1953";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -78242,6 +81330,7 @@
                                   , realgud }:
       melpaBuild {
         pname = "realgud-byebug";
+        ename = "realgud-byebug";
         version = "20180308.1923";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -78269,6 +81358,7 @@
                                          , realgud }:
       melpaBuild {
         pname = "realgud-old-debuggers";
+        ename = "realgud-old-debuggers";
         version = "20170316.31";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -78296,6 +81386,7 @@
                                , realgud }:
       melpaBuild {
         pname = "realgud-pry";
+        ename = "realgud-pry";
         version = "20160805.745";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -78321,6 +81412,7 @@
                                 , realgud }:
       melpaBuild {
         pname = "realgud-rdb2";
+        ename = "realgud-rdb2";
         version = "20160303.43";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -78346,12 +81438,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "reason-mode";
-        version = "20180505.1330";
+        ename = "reason-mode";
+        version = "20180722.437";
         src = fetchFromGitHub {
           owner = "reasonml-editor";
           repo = "reason-mode";
-          rev = "b4365012d7ca220a66e2138d0e1e65360cd80759";
-          sha256 = "1ms9j84r000nysgr7hbxzzgpqvmwjiy2ip156hmfl3rxnsba94n7";
+          rev = "5777cce583039df82a49c6fc8b57c99f127b2565";
+          sha256 = "0baxdq02i0lwk2ll3jddfz5w1paq496vd3if2p7vfipgf79y0n8g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
@@ -78371,6 +81464,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "rebecca-theme";
+        ename = "rebecca-theme";
         version = "20180324.121";
         src = fetchFromGitHub {
           owner = "vic";
@@ -78395,6 +81489,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "rebox2";
+        ename = "rebox2";
         version = "20121113.500";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -78419,6 +81514,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "recentf-ext";
+        ename = "recentf-ext";
         version = "20170925.1735";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -78444,6 +81540,7 @@
                                                     , melpaBuild }:
       melpaBuild {
         pname = "recentf-remove-sudo-tramp-prefix";
+        ename = "recentf-remove-sudo-tramp-prefix";
         version = "20180204.2156";
         src = fetchFromGitHub {
           owner = "ncaq";
@@ -78470,6 +81567,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "recompile-on-save";
+        ename = "recompile-on-save";
         version = "20151126.646";
         src = fetchFromGitHub {
           owner = "maio";
@@ -78494,6 +81592,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "recover-buffers";
+        ename = "recover-buffers";
         version = "20171008.2137";
         src = fetchFromGitHub {
           owner = "tripleee";
@@ -78518,6 +81617,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rect-plus";
+        ename = "rect+";
         version = "20150620.1744";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -78544,6 +81644,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "rectangle-utils";
+        ename = "rectangle-utils";
         version = "20160914.2108";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -78568,6 +81669,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "recursive-narrow";
+        ename = "recursive-narrow";
         version = "20140902.1027";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -78594,6 +81696,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "redis";
+        ename = "redis";
         version = "20150531.1248";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -78621,6 +81724,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "redpen-paragraph";
+        ename = "redpen-paragraph";
         version = "20160625.350";
         src = fetchFromGitHub {
           owner = "karronoli";
@@ -78646,6 +81750,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "redprl";
+        ename = "redprl";
         version = "20180418.734";
         src = fetchFromGitHub {
           owner = "RedPRL";
@@ -78671,6 +81776,7 @@
                             , paredit }:
       melpaBuild {
         pname = "redshank";
+        ename = "redshank";
         version = "20180128.1348";
         src = fetchFromGitHub {
           owner = "emacsattic";
@@ -78696,6 +81802,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "redtick";
+        ename = "redtick";
         version = "20180424.1436";
         src = fetchFromGitHub {
           owner = "ferfebles";
@@ -78725,6 +81832,7 @@
                           , s }:
       melpaBuild {
         pname = "refine";
+        ename = "refine";
         version = "20180315.1528";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -78749,6 +81857,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "regex-dsl";
+        ename = "regex-dsl";
         version = "20100124.228";
         src = fetchFromGitHub {
           owner = "alk";
@@ -78773,6 +81882,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "regex-tool";
+        ename = "regex-tool";
         version = "20170104.1118";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -78797,6 +81907,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "region-bindings-mode";
+        ename = "region-bindings-mode";
         version = "20140407.1514";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -78821,6 +81932,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "region-convert";
+        ename = "region-convert";
         version = "20161118.1859";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -78845,6 +81957,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "region-state";
+        ename = "region-state";
         version = "20151128.238";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -78869,6 +81982,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "register-channel";
+        ename = "register-channel";
         version = "20150513.2059";
         src = fetchFromGitHub {
           owner = "YangZhao11";
@@ -78894,6 +82008,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "related";
+        ename = "related";
         version = "20161002.2310";
         src = fetchgit {
           url = "https://bitbucket.org/julien-montmartin/related";
@@ -78921,6 +82036,7 @@
                                     , s }:
       melpaBuild {
         pname = "relative-buffers";
+        ename = "relative-buffers";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -78946,6 +82062,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "relax";
+        ename = "relax";
         version = "20131029.1434";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -78972,6 +82089,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "remark-mode";
+        ename = "remark-mode";
         version = "20171217.2356";
         src = fetchFromGitHub {
           owner = "torgeir";
@@ -78997,6 +82115,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "remember-last-theme";
+        ename = "remember-last-theme";
         version = "20170619.1433";
         src = fetchFromGitHub {
           owner = "anler";
@@ -79022,6 +82141,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "repeatable-motion";
+        ename = "repeatable-motion";
         version = "20170620.1148";
         src = fetchFromGitHub {
           owner = "willghatch";
@@ -79047,6 +82167,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "repeater";
+        ename = "repeater";
         version = "20180418.512";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -79072,6 +82193,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "repl-toggle";
+        ename = "repl-toggle";
         version = "20180501.328";
         src = fetchFromGitHub {
           owner = "tomterl";
@@ -79096,6 +82218,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "replace-from-region";
+        ename = "replace-from-region";
         version = "20170227.1516";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -79121,6 +82244,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "replace-pairs";
+        ename = "replace-pairs";
         version = "20160207.451";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -79145,6 +82269,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "replace-symbol";
+        ename = "replace-symbol";
         version = "20160517.1712";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -79172,6 +82297,7 @@
                                             , string-inflection }:
       melpaBuild {
         pname = "replace-with-inflections";
+        ename = "replace-with-inflections";
         version = "20170911.245";
         src = fetchFromGitHub {
           owner = "knu";
@@ -79197,6 +82323,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "repo";
+        ename = "repo";
         version = "20170213.139";
         src = fetchFromGitHub {
           owner = "canatella";
@@ -79225,6 +82352,7 @@
                                , use-package }:
       melpaBuild {
         pname = "req-package";
+        ename = "req-package";
         version = "20180506.2350";
         src = fetchFromGitHub {
           owner = "edvorg";
@@ -79250,6 +82378,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "request";
+        ename = "request";
         version = "20170131.1747";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -79276,6 +82405,7 @@
                                     , request }:
       melpaBuild {
         pname = "request-deferred";
+        ename = "request-deferred";
         version = "20160419.1605";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -79305,6 +82435,7 @@
                              , yasnippet }:
       melpaBuild {
         pname = "requirejs";
+        ename = "requirejs";
         version = "20151203.2319";
         src = fetchFromGitHub {
           owner = "joeheyming";
@@ -79329,6 +82460,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "requirejs-mode";
+        ename = "requirejs-mode";
         version = "20130215.1304";
         src = fetchFromGitHub {
           owner = "moricard";
@@ -79355,6 +82487,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "resize-window";
+        ename = "resize-window";
         version = "20170704.2212";
         src = fetchFromGitHub {
           owner = "dpsutton";
@@ -79379,6 +82512,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "restart-emacs";
+        ename = "restart-emacs";
         version = "20180601.331";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -79403,6 +82537,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "restclient";
+        ename = "restclient";
         version = "20180316.851";
         src = fetchFromGitHub {
           owner = "pashky";
@@ -79429,6 +82564,7 @@
                                    , restclient }:
       melpaBuild {
         pname = "restclient-helm";
+        ename = "restclient-helm";
         version = "20170314.854";
         src = fetchFromGitHub {
           owner = "pashky";
@@ -79455,6 +82591,7 @@
                                    , restclient }:
       melpaBuild {
         pname = "restclient-test";
+        ename = "restclient-test";
         version = "20180106.1246";
         src = fetchFromGitHub {
           owner = "simenheg";
@@ -79479,6 +82616,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "reveal-in-osx-finder";
+        ename = "reveal-in-osx-finder";
         version = "20150802.957";
         src = fetchFromGitHub {
           owner = "kaz-yos";
@@ -79504,6 +82642,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "reverse-im";
+        ename = "reverse-im";
         version = "20180213.525";
         src = fetchFromGitHub {
           owner = "a13";
@@ -79528,6 +82667,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "reverse-theme";
+        ename = "reverse-theme";
         version = "20141204.1745";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -79552,6 +82692,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "review-mode";
+        ename = "review-mode";
         version = "20180312.535";
         src = fetchFromGitHub {
           owner = "kmuto";
@@ -79577,6 +82718,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "reykjavik-theme";
+        ename = "reykjavik-theme";
         version = "20160109.0";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -79604,6 +82746,7 @@
                       , s }:
       melpaBuild {
         pname = "rg";
+        ename = "rg";
         version = "20180626.1041";
         src = fetchFromGitHub {
           owner = "dajva";
@@ -79628,6 +82771,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rhtml-mode";
+        ename = "rhtml-mode";
         version = "20130422.611";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -79653,6 +82797,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "rib-mode";
+        ename = "rib-mode";
         version = "20170726.748";
         src = fetchFromGitHub {
           owner = "blezek";
@@ -79678,6 +82823,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "rich-minority";
+        ename = "rich-minority";
         version = "20170813.622";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -79703,6 +82849,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rigid-tabs";
+        ename = "rigid-tabs";
         version = "20170903.859";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -79728,6 +82875,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "rimero-theme";
+        ename = "rimero-theme";
         version = "20180630.515";
         src = fetchFromGitHub {
           owner = "yveszoundi";
@@ -79756,6 +82904,7 @@
                           , ruby-mode ? null }:
       melpaBuild {
         pname = "rinari";
+        ename = "rinari";
         version = "20150708.2340";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -79780,6 +82929,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rings";
+        ename = "rings";
         version = "20160531.1327";
         src = fetchFromGitHub {
           owner = "konr";
@@ -79804,6 +82954,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ripgrep";
+        ename = "ripgrep";
         version = "20180323.920";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -79829,6 +82980,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "riscv-mode";
+        ename = "riscv-mode";
         version = "20170804.821";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -79855,6 +83007,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rjsx-mode";
+        ename = "rjsx-mode";
         version = "20180624.1758";
         src = fetchFromGitHub {
           owner = "felipeochoa";
@@ -79881,6 +83034,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "robe";
+        ename = "robe";
         version = "20171116.1249";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -79905,6 +83059,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "robots-txt-mode";
+        ename = "robots-txt-mode";
         version = "20170908.642";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -79930,6 +83085,7 @@
                               , popup }:
       melpaBuild {
         pname = "roguel-ike";
+        ename = "roguel-ike";
         version = "20160119.1902";
         src = fetchFromGitHub {
           owner = "stevenremot";
@@ -79954,6 +83110,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rope-read-mode";
+        ename = "rope-read-mode";
         version = "20171003.719";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -79978,6 +83135,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "rotate";
+        ename = "rotate";
         version = "20160909.136";
         src = fetchFromGitHub {
           owner = "daichirata";
@@ -80002,6 +83160,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "roy-mode";
+        ename = "roy-mode";
         version = "20121208.358";
         src = fetchFromGitHub {
           owner = "folone";
@@ -80026,6 +83185,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "rpm-spec-mode";
+        ename = "rpm-spec-mode";
         version = "20160710.436";
         src = fetchFromGitHub {
           owner = "stigbjorlykke";
@@ -80051,6 +83211,7 @@
                             , popup }:
       melpaBuild {
         pname = "rpn-calc";
+        ename = "rpn-calc";
         version = "20170522.1842";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -80075,6 +83236,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "rsense";
+        ename = "rsense";
         version = "20100510.2105";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -80101,6 +83263,7 @@
                               , ruby-mode ? null }:
       melpaBuild {
         pname = "rspec-mode";
+        ename = "rspec-mode";
         version = "20180614.448";
         src = fetchFromGitHub {
           owner = "pezra";
@@ -80125,6 +83288,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rtags";
+        ename = "rtags";
         version = "20180619.823";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -80150,6 +83314,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "rtm";
+        ename = "rtm";
         version = "20180329.808";
         src = fetchFromGitHub {
           owner = "pmiddend";
@@ -80176,6 +83341,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rubik";
+        ename = "rubik";
         version = "20180222.1214";
         src = fetchFromGitHub {
           owner = "Kurvivor19";
@@ -80201,6 +83367,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "rubocop";
+        ename = "rubocop";
         version = "20170311.2211";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -80226,6 +83393,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rubocopfmt";
+        ename = "rubocopfmt";
         version = "20180519.748";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -80252,6 +83420,7 @@
                                    , ruby-mode ? null }:
       melpaBuild {
         pname = "ruby-additional";
+        ename = "ruby-additional";
         version = "20180316.1937";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -80277,6 +83446,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ruby-compilation";
+        ename = "ruby-compilation";
         version = "20150708.2340";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -80301,6 +83471,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ruby-electric";
+        ename = "ruby-electric";
         version = "20170810.430";
         src = fetchFromGitHub {
           owner = "knu";
@@ -80325,6 +83496,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ruby-end";
+        ename = "ruby-end";
         version = "20141215.423";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -80349,6 +83521,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "ruby-extra-highlight";
+        ename = "ruby-extra-highlight";
         version = "20171106.1133";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -80374,6 +83547,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ruby-factory";
+        ename = "ruby-factory";
         version = "20160101.2321";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -80398,6 +83572,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ruby-hash-syntax";
+        ename = "ruby-hash-syntax";
         version = "20180323.1909";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -80422,6 +83597,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ruby-interpolation";
+        ename = "ruby-interpolation";
         version = "20131112.852";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -80447,6 +83623,7 @@
                                  , ruby-mode ? null }:
       melpaBuild {
         pname = "ruby-refactor";
+        ename = "ruby-refactor";
         version = "20160214.850";
         src = fetchFromGitHub {
           owner = "ajvargo";
@@ -80473,6 +83650,7 @@
                                   , ruby-mode ? null }:
       melpaBuild {
         pname = "ruby-test-mode";
+        ename = "ruby-test-mode";
         version = "20171016.931";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -80497,6 +83675,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ruby-tools";
+        ename = "ruby-tools";
         version = "20151209.815";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -80522,6 +83701,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rufo";
+        ename = "rufo";
         version = "20170718.716";
         src = fetchFromGitHub {
           owner = "danielma";
@@ -80547,6 +83727,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "rum-mode";
+        ename = "rum-mode";
         version = "20180126.1622";
         src = fetchFromGitHub {
           owner = "rumlang";
@@ -80572,6 +83753,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "run-stuff";
+        ename = "run-stuff";
         version = "20180208.2348";
         src = fetchFromGitHub {
           owner = "ideasman42";
@@ -80596,6 +83778,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "runner";
+        ename = "runner";
         version = "20160524.43";
         src = fetchFromGitHub {
           owner = "thamer";
@@ -80620,6 +83803,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "runtests";
+        ename = "runtests";
         version = "20150807.131";
         src = fetchFromGitHub {
           owner = "sunesimonsen";
@@ -80644,6 +83828,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "russian-holidays";
+        ename = "russian-holidays";
         version = "20170109.1340";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -80669,6 +83854,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rust-mode";
+        ename = "rust-mode";
         version = "20180626.1512";
         src = fetchFromGitHub {
           owner = "rust-lang";
@@ -80695,6 +83881,7 @@
                                    , rust-mode }:
       melpaBuild {
         pname = "rust-playground";
+        ename = "rust-playground";
         version = "20180507.1032";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -80720,23 +83907,25 @@
                           , fetchurl
                           , lib
                           , melpaBuild
+                          , projectile
                           , s
                           , xterm-color }:
       melpaBuild {
         pname = "rustic";
-        version = "20180704.526";
+        ename = "rustic";
+        version = "20180722.1209";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "rustic";
-          rev = "9f663fe0b7182fd2a55bdbf9969b5d06b97f097d";
-          sha256 = "0b0n5yy81wz3azsyzb20p4kf5vaz1snjgxrag8cc6kg6qrqpfv19";
+          rev = "15e4d58ded3436b4da4b1a54e5f527ca3d5de22b";
+          sha256 = "1jra1l0bz7bxkgsc0jgi9xmf1vipvzazkg40m58hhlbq1hynxm8z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic";
           sha256 = "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f s xterm-color ];
+        packageRequires = [ dash emacs f projectile s xterm-color ];
         meta = {
           homepage = "https://melpa.org/#/rustic";
           license = lib.licenses.free;
@@ -80748,6 +83937,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "rvm";
+        ename = "rvm";
         version = "20150402.742";
         src = fetchFromGitHub {
           owner = "senny";
@@ -80773,6 +83963,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ryo-modal";
+        ename = "ryo-modal";
         version = "20180331.118";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -80797,6 +83988,7 @@
                      , melpaBuild }:
       melpaBuild {
         pname = "s";
+        ename = "s";
         version = "20180406.108";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -80823,6 +84015,7 @@
                             , s }:
       melpaBuild {
         pname = "s-buffer";
+        ename = "s-buffer";
         version = "20130605.1424";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -80848,6 +84041,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "s12cpuv2-mode";
+        ename = "s12cpuv2-mode";
         version = "20171013.1351";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -80875,6 +84069,7 @@
                         , seq }:
       melpaBuild {
         pname = "s3ed";
+        ename = "s3ed";
         version = "20180204.549";
         src = fetchFromGitHub {
           owner = "mattusifer";
@@ -80899,6 +84094,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sackspace";
+        ename = "sackspace";
         version = "20130719.256";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -80927,6 +84123,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "sage-shell-mode";
+        ename = "sage-shell-mode";
         version = "20180215.35";
         src = fetchFromGitHub {
           owner = "sagemath";
@@ -80951,6 +84148,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "sailfish-scratchbox";
+        ename = "sailfish-scratchbox";
         version = "20171202.532";
         src = fetchFromGitHub {
           owner = "vityafx";
@@ -80976,6 +84174,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "salesforce-utils";
+        ename = "salesforce-utils";
         version = "20160813.1854";
         src = fetchFromGitHub {
           owner = "grimnebulin";
@@ -81004,6 +84203,7 @@
                              , yaml-mode }:
       melpaBuild {
         pname = "salt-mode";
+        ename = "salt-mode";
         version = "20180118.1754";
         src = fetchFromGitHub {
           owner = "glynnforrest";
@@ -81029,6 +84229,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sane-term";
+        ename = "sane-term";
         version = "20160620.647";
         src = fetchFromGitHub {
           owner = "adamrt";
@@ -81055,6 +84256,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sass-mode";
+        ename = "sass-mode";
         version = "20161006.2326";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -81079,6 +84281,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sauron";
+        ename = "sauron";
         version = "20171105.247";
         src = fetchFromGitHub {
           owner = "djcb";
@@ -81103,6 +84306,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "save-load-path";
+        ename = "save-load-path";
         version = "20140206.414";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -81127,6 +84331,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "save-visited-files";
+        ename = "save-visited-files";
         version = "20170228.2250";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -81151,6 +84356,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "savekill";
+        ename = "savekill";
         version = "20140417.1929";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -81175,6 +84381,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "say-what-im-doing";
+        ename = "say-what-im-doing";
         version = "20160706.1231";
         src = fetchFromGitHub {
           owner = "benaiah";
@@ -81200,6 +84407,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "sayid";
+        ename = "sayid";
         version = "20180404.1139";
         src = fetchFromGitHub {
           owner = "bpiel";
@@ -81225,6 +84433,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sbt-mode";
+        ename = "sbt-mode";
         version = "20180511.922";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -81249,6 +84458,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "scad-mode";
+        ename = "scad-mode";
         version = "20180108.1809";
         src = fetchFromGitHub {
           owner = "openscad";
@@ -81274,6 +84484,7 @@
                                 , scad-mode }:
       melpaBuild {
         pname = "scad-preview";
+        ename = "scad-preview";
         version = "20160206.536";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -81298,6 +84509,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "scala-mode";
+        ename = "scala-mode";
         version = "20170802.432";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -81322,6 +84534,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "scf-mode";
+        ename = "scf-mode";
         version = "20151121.1848";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -81346,6 +84559,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "scheme-complete";
+        ename = "scheme-complete";
         version = "20170824.713";
         src = fetchFromGitHub {
           owner = "ashinn";
@@ -81370,6 +84584,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "scheme-here";
+        ename = "scheme-here";
         version = "20141028.18";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -81395,6 +84610,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "schrute";
+        ename = "schrute";
         version = "20170521.1140";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/dwight-k.-schrute";
@@ -81418,6 +84634,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "scion";
+        ename = "scion";
         version = "20130315.555";
         src = fetchFromGitHub {
           owner = "nominolo";
@@ -81446,6 +84663,7 @@
                                      , s }:
       melpaBuild {
         pname = "sclang-extensions";
+        ename = "sclang-extensions";
         version = "20160508.2038";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -81471,6 +84689,7 @@
                                    , yasnippet }:
       melpaBuild {
         pname = "sclang-snippets";
+        ename = "sclang-snippets";
         version = "20130513.51";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -81497,6 +84716,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "scp";
+        ename = "scp";
         version = "20171203.1851";
         src = fetchFromGitHub {
           owner = "tszg";
@@ -81522,6 +84742,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "scpaste";
+        ename = "scpaste";
         version = "20171101.922";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -81546,6 +84767,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "scratch";
+        ename = "scratch";
         version = "20170614.1401";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -81570,6 +84792,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "scratch-ext";
+        ename = "scratch-ext";
         version = "20140103.2116";
         src = fetchFromGitHub {
           owner = "kyanagi";
@@ -81594,6 +84817,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "scratch-log";
+        ename = "scratch-log";
         version = "20141114.2343";
         src = fetchFromGitHub {
           owner = "mori-dev";
@@ -81618,6 +84842,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "scratch-message";
+        ename = "scratch-message";
         version = "20170107.536";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -81643,6 +84868,7 @@
                                    , popwin }:
       melpaBuild {
         pname = "scratch-palette";
+        ename = "scratch-palette";
         version = "20150225.42";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -81668,6 +84894,7 @@
                                , popwin }:
       melpaBuild {
         pname = "scratch-pop";
+        ename = "scratch-pop";
         version = "20170510.758";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -81694,6 +84921,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "scratches";
+        ename = "scratches";
         version = "20151005.2116";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -81719,6 +84947,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "scribble-mode";
+        ename = "scribble-mode";
         version = "20160124.1528";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -81747,6 +84976,7 @@
                            , thrift }:
       melpaBuild {
         pname = "scrooge";
+        ename = "scrooge";
         version = "20180630.322";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -81771,6 +85001,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "scss-mode";
+        ename = "scss-mode";
         version = "20180123.908";
         src = fetchFromGitHub {
           owner = "antonj";
@@ -81800,6 +85031,7 @@
                         , showtip }:
       melpaBuild {
         pname = "sdcv";
+        ename = "sdcv";
         version = "20180211.833";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -81825,6 +85057,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sdlang-mode";
+        ename = "sdlang-mode";
         version = "20161130.2311";
         src = fetchFromGitHub {
           owner = "CyberShadow";
@@ -81849,6 +85082,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "search-web";
+        ename = "search-web";
         version = "20150312.403";
         src = fetchFromGitHub {
           owner = "tomoya";
@@ -81874,6 +85108,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "searchq";
+        ename = "searchq";
         version = "20150829.511";
         src = fetchFromGitHub {
           owner = "boyw165";
@@ -81898,6 +85133,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "seclusion-mode";
+        ename = "seclusion-mode";
         version = "20121118.1553";
         src = fetchFromGitHub {
           owner = "dleslie";
@@ -81926,6 +85162,7 @@
                               , s }:
       melpaBuild {
         pname = "secretaria";
+        ename = "secretaria";
         version = "20180104.720";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
@@ -81951,6 +85188,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "see-mode";
+        ename = "see-mode";
         version = "20180510.1741";
         src = fetchFromGitHub {
           owner = "marcelino-m";
@@ -81975,6 +85213,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "seeing-is-believing";
+        ename = "seeing-is-believing";
         version = "20170214.520";
         src = fetchFromGitHub {
           owner = "jcinnamond";
@@ -82000,6 +85239,7 @@
                            , shadchen }:
       melpaBuild {
         pname = "seethru";
+        ename = "seethru";
         version = "20150218.1029";
         src = fetchFromGitHub {
           owner = "Benaiah";
@@ -82027,6 +85267,7 @@
                          , popup }:
       melpaBuild {
         pname = "sekka";
+        ename = "sekka";
         version = "20170803.547";
         src = fetchFromGitHub {
           owner = "kiyoka";
@@ -82051,6 +85292,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "select-themes";
+        ename = "select-themes";
         version = "20160220.1706";
         src = fetchFromGitHub {
           owner = "jasonm23";
@@ -82075,6 +85317,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "selected";
+        ename = "selected";
         version = "20170222.34";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -82099,6 +85342,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "selectric-mode";
+        ename = "selectric-mode";
         version = "20170216.311";
         src = fetchFromGitHub {
           owner = "rbanffy";
@@ -82124,6 +85368,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "semi";
+        ename = "semi";
         version = "20180204.1448";
         src = fetchFromGitHub {
           owner = "wanderlust";
@@ -82149,6 +85394,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sendto";
+        ename = "sendto";
         version = "20160425.550";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -82175,6 +85421,7 @@
                              , sequences }:
       melpaBuild {
         pname = "sensitive";
+        ename = "sensitive";
         version = "20170818.551";
         src = fetchFromGitHub {
           owner = "timvisher";
@@ -82202,6 +85449,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "sentence-navigation";
+        ename = "sentence-navigation";
         version = "20180408.919";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -82227,6 +85475,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "seoul256-theme";
+        ename = "seoul256-theme";
         version = "20180505.57";
         src = fetchFromGitHub {
           owner = "anandpiyer";
@@ -82252,6 +85501,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sequences";
+        ename = "sequences";
         version = "20170818.552";
         src = fetchFromGitHub {
           owner = "timvisher";
@@ -82276,6 +85526,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "sequential-command";
+        ename = "sequential-command";
         version = "20170925.1740";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -82308,6 +85559,7 @@
                            , web-server }:
       melpaBuild {
         pname = "servant";
+        ename = "servant";
         version = "20140216.419";
         src = fetchFromGitHub {
           owner = "cask";
@@ -82336,6 +85588,7 @@
                               , s }:
       melpaBuild {
         pname = "serverspec";
+        ename = "serverspec";
         version = "20150623.455";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -82361,6 +85614,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "services";
+        ename = "services";
         version = "20170802.430";
         src = fetchFromGitHub {
           owner = "davep";
@@ -82386,12 +85640,13 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sesman";
-        version = "20180628.659";
+        ename = "sesman";
+        version = "20180719.213";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "sesman";
-          rev = "0d3d016732b42163f78243488f54e10a802796f3";
-          sha256 = "1i5drx6qiq8kzg45qwzrwq2zx01ibmn9pgmpqy0w5kljb17jchkl";
+          rev = "43b0c9ef2a9ba7608d27c24fb0daedc1deabf179";
+          sha256 = "1w0fy74snc7gy7cmxfmlbvmdgpywi3grj5ph72liinxlpl1cw218";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman";
@@ -82410,6 +85665,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "session";
+        ename = "session";
         version = "20120510.1700";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -82434,6 +85690,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "seti-theme";
+        ename = "seti-theme";
         version = "20161208.836";
         src = fetchFromGitHub {
           owner = "caisah";
@@ -82458,6 +85715,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sexp-move";
+        ename = "sexp-move";
         version = "20150915.1030";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -82482,6 +85740,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "sexy-monochrome-theme";
+        ename = "sexy-monochrome-theme";
         version = "20180526.108";
         src = fetchFromGitHub {
           owner = "voloyev";
@@ -82507,6 +85766,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shackle";
+        ename = "shackle";
         version = "20171209.1401";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -82531,6 +85791,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "shadchen";
+        ename = "shadchen";
         version = "20141102.1039";
         src = fetchFromGitHub {
           owner = "VincentToups";
@@ -82556,6 +85817,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "shader-mode";
+        ename = "shader-mode";
         version = "20180518.457";
         src = fetchFromGitHub {
           owner = "midnightSuyama";
@@ -82580,6 +85842,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "shakespeare-mode";
+        ename = "shakespeare-mode";
         version = "20180704.1438";
         src = fetchFromGitHub {
           owner = "CodyReichert";
@@ -82604,6 +85867,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shampoo";
+        ename = "shampoo";
         version = "20131230.219";
         src = fetchFromGitHub {
           owner = "dmatveev";
@@ -82628,6 +85892,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "shell-command";
+        ename = "shell-command";
         version = "20090830.340";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -82652,6 +85917,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "shell-current-directory";
+        ename = "shell-current-directory";
         version = "20140101.1554";
         src = fetchFromGitHub {
           owner = "metaperl";
@@ -82676,6 +85942,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shell-here";
+        ename = "shell-here";
         version = "20150728.1004";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -82700,6 +85967,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "shell-history";
+        ename = "shell-history";
         version = "20100505.139";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -82726,6 +85994,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "shell-pop";
+        ename = "shell-pop";
         version = "20170304.616";
         src = fetchFromGitHub {
           owner = "kyagi";
@@ -82750,6 +86019,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "shell-split-string";
+        ename = "shell-split-string";
         version = "20151224.208";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -82775,6 +86045,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "shell-switcher";
+        ename = "shell-switcher";
         version = "20161028.2252";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -82799,6 +86070,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "shell-toggle";
+        ename = "shell-toggle";
         version = "20150226.611";
         src = fetchFromGitHub {
           owner = "knu";
@@ -82825,6 +86097,7 @@
                             , s }:
       melpaBuild {
         pname = "shelldoc";
+        ename = "shelldoc";
         version = "20151114.1925";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -82849,6 +86122,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "shelltest-mode";
+        ename = "shelltest-mode";
         version = "20180430.1841";
         src = fetchFromGitHub {
           owner = "rtrn";
@@ -82874,6 +86148,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shen-elisp";
+        ename = "shen-elisp";
         version = "20170427.1502";
         src = fetchFromGitHub {
           owner = "deech";
@@ -82898,6 +86173,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "shift-number";
+        ename = "shift-number";
         version = "20170301.659";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -82924,6 +86200,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shift-text";
+        ename = "shift-text";
         version = "20130831.955";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -82948,6 +86225,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shimbun";
+        ename = "shimbun";
         version = "20180325.2048";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -82972,6 +86250,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "shm";
+        ename = "shm";
         version = "20180326.1757";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -82997,6 +86276,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shoulda";
+        ename = "shoulda";
         version = "20140616.1133";
         src = fetchFromGitHub {
           owner = "marcwebbie";
@@ -83023,6 +86303,7 @@
                             , s }:
       melpaBuild {
         pname = "show-css";
+        ename = "show-css";
         version = "20160210.608";
         src = fetchFromGitHub {
           owner = "8cylinder";
@@ -83041,12 +86322,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    show-marks = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , fm
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "show-marks";
+        ename = "show-marks";
+        version = "20130805.749";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "show-marks";
+          rev = "97609566582e65eed0d0a854efa5c312f209115d";
+          sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks";
+          sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
+          name = "recipe";
+        };
+        packageRequires = [ fm ];
+        meta = {
+          homepage = "https://melpa.org/#/show-marks";
+          license = lib.licenses.free;
+        };
+      }) {};
     showtip = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
                            , melpaBuild }:
       melpaBuild {
         pname = "showtip";
+        ename = "showtip";
         version = "20090830.340";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -83071,6 +86379,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shpec-mode";
+        ename = "shpec-mode";
         version = "20150530.222";
         src = fetchFromGitHub {
           owner = "shpec";
@@ -83097,6 +86406,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "shr-tag-pre-highlight";
+        ename = "shr-tag-pre-highlight";
         version = "20171113.114";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -83125,6 +86435,7 @@
                                , s }:
       melpaBuild {
         pname = "shrink-path";
+        ename = "shrink-path";
         version = "20170812.1947";
         src = fetchFromGitLab {
           owner = "bennya";
@@ -83149,6 +86460,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "shrink-whitespace";
+        ename = "shrink-whitespace";
         version = "20150916.1215";
         src = fetchFromGitHub {
           owner = "jcpetkovich";
@@ -83175,6 +86487,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shut-up";
+        ename = "shut-up";
         version = "20180628.1130";
         src = fetchFromGitHub {
           owner = "cask";
@@ -83200,6 +86513,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "shx";
+        ename = "shx";
         version = "20180528.1408";
         src = fetchFromGitHub {
           owner = "riscy";
@@ -83224,6 +86538,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "sibilant-mode";
+        ename = "sibilant-mode";
         version = "20151119.1345";
         src = fetchFromGitHub {
           owner = "jbr";
@@ -83248,6 +86563,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "sicp";
+        ename = "sicp";
         version = "20171028.1523";
         src = fetchFromGitHub {
           owner = "webframp";
@@ -83273,6 +86589,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "side-notes";
+        ename = "side-notes";
         version = "20180523.2328";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -83297,6 +86614,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "sift";
+        ename = "sift";
         version = "20160107.215";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -83323,6 +86641,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "signal";
+        ename = "signal";
         version = "20160816.738";
         src = fetchFromGitHub {
           owner = "Mola-T";
@@ -83347,6 +86666,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "signature";
+        ename = "signature";
         version = "20140730.1249";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -83372,6 +86692,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "silkworm-theme";
+        ename = "silkworm-theme";
         version = "20180301.637";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -83396,6 +86717,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "simp";
+        ename = "simp";
         version = "20180606.1954";
         src = fetchFromGitHub {
           owner = "re5et";
@@ -83421,6 +86743,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "simple-bookmarks";
+        ename = "simple-bookmarks";
         version = "20160804.701";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
@@ -83447,6 +86770,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "simple-call-tree";
+        ename = "simple-call-tree";
         version = "20180224.1256";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -83472,6 +86796,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "simple-httpd";
+        ename = "simple-httpd";
         version = "20180528.903";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -83497,12 +86822,13 @@
                               , s }:
       melpaBuild {
         pname = "simple-mpc";
-        version = "20180224.1801";
+        ename = "simple-mpc";
+        version = "20180715.1829";
         src = fetchFromGitHub {
           owner = "jorenvo";
           repo = "simple-mpc";
-          rev = "6aa491936e3529e8c2a42d4d7ee16ba54191d27e";
-          sha256 = "0dwshc88mhv2z490jfa0q5qfkirj1js1k0wk5pnp9l5mvagnxcdd";
+          rev = "bee8520e81292b4c7353e45b193f9a13b482f5b2";
+          sha256 = "1ja06pv007cmzjjgka95jlg31k7d29jrih1yxyblsxv85s9sg21q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc";
@@ -83523,6 +86849,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "simple-paren";
+        ename = "simple-paren";
         version = "20180427.218";
         src = fetchFromGitHub {
           owner = "andreas-roehler";
@@ -83549,6 +86876,7 @@
                               , rtm }:
       melpaBuild {
         pname = "simple-rtm";
+        ename = "simple-rtm";
         version = "20160222.734";
         src = fetchFromGitLab {
           owner = "mbunkus";
@@ -83573,6 +86901,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "simple-screen";
+        ename = "simple-screen";
         version = "20161009.220";
         src = fetchFromGitHub {
           owner = "wachikun";
@@ -83597,6 +86926,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "simpleclip";
+        ename = "simpleclip";
         version = "20170803.540";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -83621,6 +86951,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "simplenote";
+        ename = "simplenote";
         version = "20141118.640";
         src = fetchFromGitHub {
           owner = "dotemacs";
@@ -83646,6 +86977,7 @@
                                , request-deferred }:
       melpaBuild {
         pname = "simplenote2";
+        ename = "simplenote2";
         version = "20171201.1806";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -83672,6 +87004,7 @@
                              , s }:
       melpaBuild {
         pname = "simplezen";
+        ename = "simplezen";
         version = "20130421.300";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -83702,6 +87035,7 @@
                             , s }:
       melpaBuild {
         pname = "skeletor";
+        ename = "skeletor";
         version = "20170616.1746";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -83727,6 +87061,7 @@
                                , skewer-mode }:
       melpaBuild {
         pname = "skewer-less";
+        ename = "skewer-less";
         version = "20160828.1321";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -83754,6 +87089,7 @@
                                , simple-httpd }:
       melpaBuild {
         pname = "skewer-mode";
+        ename = "skewer-mode";
         version = "20180706.1107";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -83779,6 +87115,7 @@
                                              , skewer-mode }:
       melpaBuild {
         pname = "skewer-reload-stylesheets";
+        ename = "skewer-reload-stylesheets";
         version = "20160725.520";
         src = fetchFromGitHub {
           owner = "NateEag";
@@ -83803,6 +87140,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "skype";
+        ename = "skype";
         version = "20160711.124";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -83828,6 +87166,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "sl";
+        ename = "sl";
         version = "20161217.604";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -83858,6 +87197,7 @@
                          , websocket }:
       melpaBuild {
         pname = "slack";
+        ename = "slack";
         version = "20180712.2222";
         src = fetchFromGitHub {
           owner = "yuya373";
@@ -83883,6 +87223,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "slideview";
+        ename = "slideview";
         version = "20150324.1540";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -83907,6 +87248,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "slim-mode";
+        ename = "slim-mode";
         version = "20170728.648";
         src = fetchFromGitHub {
           owner = "slim-template";
@@ -83933,12 +87275,13 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "slime";
-        version = "20180701.1344";
+        ename = "slime";
+        version = "20180719.1821";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "b05315a838c2720f2585d3f890f3b5cb66b13d69";
-          sha256 = "1jlph9k2isk61kzljs593hlzipwvlvx3vi41rrvmfnfzalyrgjgd";
+          rev = "289e4d7117b034dea668a6d28f9ddb7eb80f57ed";
+          sha256 = "0sanswnqyk50hgkr0p0zhxm3dfg72p4xcv7ivf2vivfqq68pyvym";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -83960,6 +87303,7 @@
                                  , slime }:
       melpaBuild {
         pname = "slime-company";
+        ename = "slime-company";
         version = "20180119.1043";
         src = fetchFromGitHub {
           owner = "anwyn";
@@ -83988,6 +87332,7 @@
                                 , slime }:
       melpaBuild {
         pname = "slime-docker";
+        ename = "slime-docker";
         version = "20171004.1151";
         src = fetchFromGitHub {
           owner = "daewok";
@@ -84013,6 +87358,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "slime-theme";
+        ename = "slime-theme";
         version = "20170808.622";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -84037,6 +87383,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "slime-volleyball";
+        ename = "slime-volleyball";
         version = "20140717.2141";
         src = fetchFromGitHub {
           owner = "fitzsim";
@@ -84062,6 +87409,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "slirm";
+        ename = "slirm";
         version = "20160201.625";
         src = fetchFromGitHub {
           owner = "fbie";
@@ -84086,6 +87434,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "slovak-holidays";
+        ename = "slovak-holidays";
         version = "20150418.155";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -84112,6 +87461,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "slstats";
+        ename = "slstats";
         version = "20170823.149";
         src = fetchFromGitHub {
           owner = "davep";
@@ -84137,12 +87487,13 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "sly";
-        version = "20180715.603";
+        ename = "sly";
+        version = "20180722.1611";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "30c7fc9cbc1cfd69022d106e1b667a26ad05ea03";
-          sha256 = "0lq2s2vj5dp64010vwjyg5zy6mjw28rc399vmyysl7mkambslf8s";
+          rev = "4b260fdda880f8287327c0c0055e2f18fd91201d";
+          sha256 = "05s248657hgi4sp8g1d5zsq1x4nwxvairzx17psqkwflxc11cpv6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -84162,6 +87513,7 @@
                                    , sly }:
       melpaBuild {
         pname = "sly-hello-world";
+        ename = "sly-hello-world";
         version = "20160119.636";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -84188,6 +87540,7 @@
                                  , sly }:
       melpaBuild {
         pname = "sly-macrostep";
+        ename = "sly-macrostep";
         version = "20160119.434";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -84213,6 +87566,7 @@
                                         , sly }:
       melpaBuild {
         pname = "sly-named-readtables";
+        ename = "sly-named-readtables";
         version = "20150817.816";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -84238,6 +87592,7 @@
                                  , sly }:
       melpaBuild {
         pname = "sly-quicklisp";
+        ename = "sly-quicklisp";
         version = "20170112.135";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -84264,6 +87619,7 @@
                                        , sly }:
       melpaBuild {
         pname = "sly-repl-ansi-color";
+        ename = "sly-repl-ansi-color";
         version = "20171020.816";
         src = fetchFromGitHub {
           owner = "PuercoPop";
@@ -84288,6 +87644,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "smart-backspace";
+        ename = "smart-backspace";
         version = "20171013.2226";
         src = fetchFromGitHub {
           owner = "itome";
@@ -84312,6 +87669,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smart-comment";
+        ename = "smart-comment";
         version = "20160322.1139";
         src = fetchFromGitHub {
           owner = "paldepind";
@@ -84336,6 +87694,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smart-compile";
+        ename = "smart-compile";
         version = "20180315.2030";
         src = fetchFromGitHub {
           owner = "zenitani";
@@ -84360,6 +87719,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "smart-cursor-color";
+        ename = "smart-cursor-color";
         version = "20141124.919";
         src = fetchFromGitHub {
           owner = "7696122";
@@ -84384,6 +87744,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "smart-dash";
+        ename = "smart-dash";
         version = "20110130.1916";
         src = fetchhg {
           url = "https://bitbucket.com/malsyned/smart-dash";
@@ -84408,6 +87769,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smart-forward";
+        ename = "smart-forward";
         version = "20140430.13";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -84433,6 +87795,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "smart-hungry-delete";
+        ename = "smart-hungry-delete";
         version = "20170412.643";
         src = fetchFromGitHub {
           owner = "hrehfeld";
@@ -84457,6 +87820,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "smart-indent-rigidly";
+        ename = "smart-indent-rigidly";
         version = "20141205.1615";
         src = fetchFromGitHub {
           owner = "re5et";
@@ -84483,6 +87847,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "smart-jump";
+        ename = "smart-jump";
         version = "20180709.2205";
         src = fetchFromGitHub {
           owner = "jojojames";
@@ -84507,6 +87872,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "smart-mark";
+        ename = "smart-mark";
         version = "20150911.1910";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -84533,6 +87899,7 @@
                                    , rich-minority }:
       melpaBuild {
         pname = "smart-mode-line";
+        ename = "smart-mode-line";
         version = "20180422.1459";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -84560,6 +87927,7 @@
                                                    , smart-mode-line }:
       melpaBuild {
         pname = "smart-mode-line-powerline-theme";
+        ename = "smart-mode-line-powerline-theme";
         version = "20160705.1738";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -84584,6 +87952,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smart-newline";
+        ename = "smart-newline";
         version = "20131207.1940";
         src = fetchFromGitHub {
           owner = "ainame";
@@ -84612,6 +87981,7 @@
                                 , multiple-cursors }:
       melpaBuild {
         pname = "smart-region";
+        ename = "smart-region";
         version = "20150903.703";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -84637,6 +88007,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "smart-semicolon";
+        ename = "smart-semicolon";
         version = "20171007.1833";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -84661,6 +88032,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "smart-shift";
+        ename = "smart-shift";
         version = "20150202.2325";
         src = fetchFromGitHub {
           owner = "hbin";
@@ -84685,6 +88057,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "smart-tab";
+        ename = "smart-tab";
         version = "20170902.1407";
         src = fetchFromGitHub {
           owner = "genehack";
@@ -84709,6 +88082,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "smart-tabs-mode";
+        ename = "smart-tabs-mode";
         version = "20160629.752";
         src = fetchFromGitHub {
           owner = "jcsalomon";
@@ -84734,6 +88108,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "smart-window";
+        ename = "smart-window";
         version = "20160716.1830";
         src = fetchFromGitHub {
           owner = "dryman";
@@ -84760,12 +88135,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "smartparens";
-        version = "20180705.801";
+        ename = "smartparens";
+        version = "20180717.335";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "6329f779792441b7d1157dfc8646a8b3e49b3a33";
-          sha256 = "0489yfrxi0k5b4qa6mdkgmwzv9cacvnxqq984nsr92bws2b9ng9r";
+          rev = "34b53320f4ac41a60d641c5363cd5e02db37089e";
+          sha256 = "1yv31wzf7wzkqpvmr3rdiphg4h7224bjfv5pr17gmgzjv9hlq3k2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -84784,6 +88160,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "smartrep";
+        ename = "smartrep";
         version = "20150508.1930";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -84808,6 +88185,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "smartscan";
+        ename = "smartscan";
         version = "20170211.1233";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -84832,6 +88210,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "smarty-mode";
+        ename = "smarty-mode";
         version = "20100703.458";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -84856,6 +88235,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "smbc";
+        ename = "smbc";
         version = "20171229.1008";
         src = fetchFromGitHub {
           owner = "sakshamsharma";
@@ -84881,6 +88261,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "smblog";
+        ename = "smblog";
         version = "20170419.321";
         src = fetchFromGitHub {
           owner = "aaptel";
@@ -84906,6 +88287,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "smeargle";
+        ename = "smeargle";
         version = "20161212.1558";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -84931,6 +88313,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "smex";
+        ename = "smex";
         version = "20151212.1409";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -84955,6 +88338,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "smiles-mode";
+        ename = "smiles-mode";
         version = "20160717.420";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -84979,6 +88363,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "sml-modeline";
+        ename = "sml-modeline";
         version = "20170614.1411";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -85003,6 +88388,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "smmry";
+        ename = "smmry";
         version = "20161024.201";
         src = fetchFromGitHub {
           owner = "microamp";
@@ -85027,6 +88413,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smooth-scroll";
+        ename = "smooth-scroll";
         version = "20130321.2114";
         src = fetchFromGitHub {
           owner = "k-talo";
@@ -85051,6 +88438,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "smooth-scrolling";
+        ename = "smooth-scrolling";
         version = "20161002.1249";
         src = fetchFromGitHub {
           owner = "aspiers";
@@ -85075,6 +88463,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "smotitah";
+        ename = "smotitah";
         version = "20150218.230";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -85099,6 +88488,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "smtpmail-multi";
+        ename = "smtpmail-multi";
         version = "20160218.1549";
         src = fetchFromGitHub {
           owner = "vapniks";
@@ -85123,6 +88513,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "smyx-theme";
+        ename = "smyx-theme";
         version = "20141127.28";
         src = fetchFromGitHub {
           owner = "tacit7";
@@ -85150,6 +88541,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "snakemake-mode";
+        ename = "snakemake-mode";
         version = "20180519.1739";
         src = fetchFromGitHub {
           owner = "kyleam";
@@ -85175,6 +88567,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "snapshot-timemachine";
+        ename = "snapshot-timemachine";
         version = "20161221.129";
         src = fetchFromGitHub {
           owner = "mrBliss";
@@ -85201,6 +88594,7 @@
                                                   , snapshot-timemachine }:
       melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
+        ename = "snapshot-timemachine-rsnapshot";
         version = "20170324.513";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -85227,6 +88621,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "snazzy-theme";
+        ename = "snazzy-theme";
         version = "20170823.1132";
         src = fetchFromGitHub {
           owner = "weijiangan";
@@ -85251,6 +88646,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "snippet";
+        ename = "snippet";
         version = "20130210.1515";
         src = fetchFromGitHub {
           owner = "pkazmier";
@@ -85277,6 +88673,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "snoopy";
+        ename = "snoopy";
         version = "20171008.1304";
         src = fetchFromGitHub {
           owner = "anmonteiro";
@@ -85305,6 +88702,7 @@
                          , s }:
       melpaBuild {
         pname = "socyl";
+        ename = "socyl";
         version = "20170211.2242";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -85329,6 +88727,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "soft-charcoal-theme";
+        ename = "soft-charcoal-theme";
         version = "20140420.943";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -85353,6 +88752,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "soft-morning-theme";
+        ename = "soft-morning-theme";
         version = "20150918.1341";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -85378,6 +88778,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "soft-stone-theme";
+        ename = "soft-stone-theme";
         version = "20140614.135";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -85404,6 +88805,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "solaire-mode";
+        ename = "solaire-mode";
         version = "20180521.235";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -85431,6 +88833,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "solarized-theme";
+        ename = "solarized-theme";
         version = "20180621.1407";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -85455,12 +88858,13 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "solidity-mode";
-        version = "20180429.1111";
+        ename = "solidity-mode";
+        version = "20180721.1614";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "3a0afdfda0dd6a2cfa6ca7a695e59cb19129294d";
-          sha256 = "1pfmi10ilzhfxqq9i5jnz36wlhwwanf7y8gzdmzff3qmdbws46y8";
+          rev = "d89dae03c9c6cb86f4e935081cb828c6c5c62830";
+          sha256 = "11n3z0ibgsw16r34ba8i6fl43b1hx4q7b6v6g12kmfpss86dvv1d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -85484,6 +88888,7 @@
                             , osc }:
       melpaBuild {
         pname = "sonic-pi";
+        ename = "sonic-pi";
         version = "20171205.405";
         src = fetchFromGitHub {
           owner = "repl-electric";
@@ -85509,6 +88914,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "soothe-theme";
+        ename = "soothe-theme";
         version = "20141027.741";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -85533,6 +88939,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "sort-words";
+        ename = "sort-words";
         version = "20160929.635";
         src = fetchFromGitHub {
           owner = "dotemacs";
@@ -85558,6 +88965,7 @@
                        , org }:
       melpaBuild {
         pname = "sos";
+        ename = "sos";
         version = "20141214.2003";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -85586,6 +88994,7 @@
                               , sotlisp }:
       melpaBuild {
         pname = "sotclojure";
+        ename = "sotclojure";
         version = "20170921.1708";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -85611,6 +89020,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "sotlisp";
+        ename = "sotlisp";
         version = "20180706.1049";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -85637,6 +89047,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sound-wav";
+        ename = "sound-wav";
         version = "20160725.724";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -85667,6 +89078,7 @@
                               , string-utils }:
       melpaBuild {
         pname = "soundcloud";
+        ename = "soundcloud";
         version = "20150501.2026";
         src = fetchFromGitHub {
           owner = "thieman";
@@ -85705,6 +89117,7 @@
                               , s }:
       melpaBuild {
         pname = "soundklaus";
+        ename = "soundklaus";
         version = "20160314.531";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -85733,6 +89146,7 @@
                              , request }:
       melpaBuild {
         pname = "sourcekit";
+        ename = "sourcekit";
         version = "20180101.34";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -85758,6 +89172,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sourcemap";
+        ename = "sourcemap";
         version = "20161215.2140";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -85782,6 +89197,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "sourcerer-theme";
+        ename = "sourcerer-theme";
         version = "20161014.925";
         src = fetchFromGitHub {
           owner = "gilbertw1";
@@ -85807,6 +89223,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sourcetrail";
+        ename = "sourcetrail";
         version = "20170410.1437";
         src = fetchFromGitHub {
           owner = "CoatiSoftware";
@@ -85832,6 +89249,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "spacegray-theme";
+        ename = "spacegray-theme";
         version = "20150719.1231";
         src = fetchFromGitHub {
           owner = "bruce";
@@ -85861,6 +89279,7 @@
                              , s }:
       melpaBuild {
         pname = "spaceline";
+        ename = "spaceline";
         version = "20180628.46";
         src = fetchFromGitHub {
           owner = "TheBB";
@@ -85889,6 +89308,7 @@
                                            , spaceline }:
       melpaBuild {
         pname = "spaceline-all-the-icons";
+        ename = "spaceline-all-the-icons";
         version = "20170829.120";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -85913,6 +89333,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "spacemacs-theme";
+        ename = "spacemacs-theme";
         version = "20180618.1129";
         src = fetchFromGitHub {
           owner = "nashamri";
@@ -85937,6 +89358,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "spaces";
+        ename = "spaces";
         version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
@@ -85962,6 +89384,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "spark";
+        ename = "spark";
         version = "20160414.1901";
         src = fetchFromGitHub {
           owner = "alvinfrancis";
@@ -85987,6 +89410,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sparkline";
+        ename = "sparkline";
         version = "20150101.519";
         src = fetchFromGitHub {
           owner = "woudshoo";
@@ -86013,6 +89437,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sparql-mode";
+        ename = "sparql-mode";
         version = "20180320.1102";
         src = fetchFromGitHub {
           owner = "ljos";
@@ -86038,6 +89463,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "speech-tagger";
+        ename = "speech-tagger";
         version = "20170728.1129";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -86062,6 +89488,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "speechd-el";
+        ename = "speechd-el";
         version = "20180105.1217";
         src = fetchFromGitHub {
           owner = "brailcom";
@@ -86088,6 +89515,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "speed-type";
+        ename = "speed-type";
         version = "20171230.847";
         src = fetchFromGitHub {
           owner = "parkouss";
@@ -86113,6 +89541,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "speeddating";
+        ename = "speeddating";
         version = "20180319.23";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -86140,6 +89569,7 @@
                               , s }:
       melpaBuild {
         pname = "sphinx-doc";
+        ename = "sphinx-doc";
         version = "20160116.317";
         src = fetchFromGitHub {
           owner = "naiquevin";
@@ -86164,6 +89594,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "sphinx-frontend";
+        ename = "sphinx-frontend";
         version = "20161025.58";
         src = fetchFromGitHub {
           owner = "kostafey";
@@ -86190,6 +89621,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sphinx-mode";
+        ename = "sphinx-mode";
         version = "20180620.215";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -86215,6 +89647,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "spice-mode";
+        ename = "spice-mode";
         version = "20171027.2343";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -86245,6 +89678,7 @@
                           , treepy }:
       melpaBuild {
         pname = "spiral";
+        ename = "spiral";
         version = "20180223.340";
         src = fetchFromGitHub {
           owner = "unrepl";
@@ -86270,6 +89704,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "splitjoin";
+        ename = "splitjoin";
         version = "20150505.732";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -86294,6 +89729,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "splitter";
+        ename = "splitter";
         version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
@@ -86319,6 +89755,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "spotify";
+        ename = "spotify";
         version = "20170302.2229";
         src = fetchFromGitHub {
           owner = "remvee";
@@ -86346,6 +89783,7 @@
                              , swiper }:
       melpaBuild {
         pname = "spotlight";
+        ename = "spotlight";
         version = "20150929.55";
         src = fetchFromGitHub {
           owner = "benmaughan";
@@ -86370,6 +89808,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "spray";
+        ename = "spray";
         version = "20160304.1420";
         src = fetchFromGitLab {
           owner = "iankelling";
@@ -86395,6 +89834,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "springboard";
+        ename = "springboard";
         version = "20170105.2355";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -86420,6 +89860,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "sprintly-mode";
+        ename = "sprintly-mode";
         version = "20121005.2234";
         src = fetchFromGitHub {
           owner = "sprintly";
@@ -86444,6 +89885,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sproto-mode";
+        ename = "sproto-mode";
         version = "20151115.1005";
         src = fetchFromGitHub {
           owner = "m2q1n9";
@@ -86470,6 +89912,7 @@
                            , request }:
       melpaBuild {
         pname = "sprunge";
+        ename = "sprunge";
         version = "20160229.1843";
         src = fetchFromGitHub {
           owner = "tomjakubowski";
@@ -86497,6 +89940,7 @@
                        , timp }:
       melpaBuild {
         pname = "spu";
+        ename = "spu";
         version = "20161213.1924";
         src = fetchFromGitHub {
           owner = "mola-T";
@@ -86522,6 +89966,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "sql-clickhouse";
+        ename = "sql-clickhouse";
         version = "20180302.755";
         src = fetchFromGitHub {
           owner = "leethargo";
@@ -86546,6 +89991,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "sql-impala";
+        ename = "sql-impala";
         version = "20160427.1658";
         src = fetchFromGitHub {
           owner = "jterk";
@@ -86570,6 +90016,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sqlite";
+        ename = "sqlite";
         version = "20180708.1011";
         src = fetchFromGitLab {
           owner = "cnngimenez";
@@ -86594,6 +90041,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "sqlup-mode";
+        ename = "sqlup-mode";
         version = "20170610.837";
         src = fetchFromGitHub {
           owner = "Trevoke";
@@ -86618,6 +90066,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sr-speedbar";
+        ename = "sr-speedbar";
         version = "20161025.131";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -86643,6 +90092,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "srcery-theme";
+        ename = "srcery-theme";
         version = "20180623.619";
         src = fetchFromGitHub {
           owner = "srcery-colors";
@@ -86668,6 +90118,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "srefactor";
+        ename = "srefactor";
         version = "20180703.1110";
         src = fetchFromGitHub {
           owner = "tuhdo";
@@ -86693,6 +90144,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssass-mode";
+        ename = "ssass-mode";
         version = "20180428.1339";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -86717,6 +90169,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ssh";
+        ename = "ssh";
         version = "20120904.1342";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -86743,6 +90196,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssh-agency";
+        ename = "ssh-agency";
         version = "20180507.1726";
         src = fetchFromGitHub {
           owner = "magit";
@@ -86767,6 +90221,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ssh-config-mode";
+        ename = "ssh-config-mode";
         version = "20180609.251";
         src = fetchFromGitHub {
           owner = "jhgorrell";
@@ -86792,6 +90247,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssh-deploy";
+        ename = "ssh-deploy";
         version = "20180713.650";
         src = fetchFromGitHub {
           owner = "cjohansson";
@@ -86818,6 +90274,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ssh-tunnels";
+        ename = "ssh-tunnels";
         version = "20180703.1327";
         src = fetchFromGitHub {
           owner = "death";
@@ -86845,6 +90302,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "stack-mode";
+        ename = "stack-mode";
         version = "20150923.823";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
@@ -86869,6 +90327,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "stan-mode";
+        ename = "stan-mode";
         version = "20180110.1441";
         src = fetchFromGitHub {
           owner = "stan-dev";
@@ -86895,6 +90354,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "stan-snippets";
+        ename = "stan-snippets";
         version = "20161023.1958";
         src = fetchFromGitHub {
           owner = "stan-dev";
@@ -86919,6 +90379,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "standoff-mode";
+        ename = "standoff-mode";
         version = "20171115.931";
         src = fetchFromGitHub {
           owner = "lueck";
@@ -86945,6 +90406,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "start-menu";
+        ename = "start-menu";
         version = "20160426.525";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -86969,6 +90431,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "stash";
+        ename = "stash";
         version = "20151117.627";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -86994,6 +90457,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "state";
+        ename = "state";
         version = "20180627.1256";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -87018,6 +90482,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "status";
+        ename = "status";
         version = "20151230.608";
         src = fetchFromGitHub {
           owner = "tromey";
@@ -87043,6 +90508,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "steam";
+        ename = "steam";
         version = "20171108.1613";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -87067,6 +90533,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "stem";
+        ename = "stem";
         version = "20131102.409";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -87092,6 +90559,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "stem-english";
+        ename = "stem-english";
         version = "20180108.1958";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -87116,6 +90584,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "stgit";
+        ename = "stgit";
         version = "20171130.759";
         src = fetchFromGitHub {
           owner = "ctmarinas";
@@ -87140,6 +90609,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sticky";
+        ename = "sticky";
         version = "20170925.1736";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -87165,6 +90635,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "stickyfunc-enhance";
+        ename = "stickyfunc-enhance";
         version = "20150429.1114";
         src = fetchFromGitHub {
           owner = "tuhdo";
@@ -87191,6 +90662,7 @@
                                 , s }:
       melpaBuild {
         pname = "stock-ticker";
+        ename = "stock-ticker";
         version = "20150204.252";
         src = fetchFromGitHub {
           owner = "hagleitn";
@@ -87215,6 +90687,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "strace-mode";
+        ename = "strace-mode";
         version = "20171116.1239";
         src = fetchFromGitHub {
           owner = "pkmoore";
@@ -87240,6 +90713,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "strie";
+        ename = "strie";
         version = "20160211.1422";
         src = fetchFromGitHub {
           owner = "jcatw";
@@ -87265,6 +90739,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "string-edit";
+        ename = "string-edit";
         version = "20160410.2356";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -87289,6 +90764,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "string-inflection";
+        ename = "string-inflection";
         version = "20180518.1707";
         src = fetchFromGitHub {
           owner = "akicho8";
@@ -87314,6 +90790,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "string-utils";
+        ename = "string-utils";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -87339,6 +90816,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "stripe-buffer";
+        ename = "stripe-buffer";
         version = "20141208.708";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -87363,6 +90841,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "stumpwm-mode";
+        ename = "stumpwm-mode";
         version = "20140130.1816";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/stumpwm.git";
@@ -87386,6 +90865,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "stupid-indent-mode";
+        ename = "stupid-indent-mode";
         version = "20170525.417";
         src = fetchgit {
           url = "https://gist.github.com/5487564.git";
@@ -87409,6 +90889,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "stylefmt";
+        ename = "stylefmt";
         version = "20161025.124";
         src = fetchFromGitHub {
           owner = "KeenS";
@@ -87434,6 +90915,7 @@
                                , sws-mode }:
       melpaBuild {
         pname = "stylus-mode";
+        ename = "stylus-mode";
         version = "20150313.812";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -87458,6 +90940,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "subatomic-theme";
+        ename = "subatomic-theme";
         version = "20160126.738";
         src = fetchFromGitHub {
           owner = "cryon";
@@ -87482,6 +90965,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "subatomic256-theme";
+        ename = "subatomic256-theme";
         version = "20130620.1910";
         src = fetchFromGitHub {
           owner = "d11wtq";
@@ -87506,6 +90990,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "subemacs";
+        ename = "subemacs";
         version = "20170401.234";
         src = fetchFromGitHub {
           owner = "kbauer";
@@ -87530,6 +91015,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "sublime-themes";
+        ename = "sublime-themes";
         version = "20170606.1144";
         src = fetchFromGitHub {
           owner = "owainlewis";
@@ -87555,6 +91041,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sublimity";
+        ename = "sublimity";
         version = "20170820.827";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -87579,6 +91066,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "sudden-death";
+        ename = "sudden-death";
         version = "20180216.1623";
         src = fetchFromGitHub {
           owner = "yewton";
@@ -87605,6 +91093,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sudo-edit";
+        ename = "sudo-edit";
         version = "20180608.911";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -87629,6 +91118,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sudo-ext";
+        ename = "sudo-ext";
         version = "20170126.414";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -87654,6 +91144,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sudoku";
+        ename = "sudoku";
         version = "20161110.2306";
         src = fetchFromGitHub {
           owner = "zevlg";
@@ -87680,22 +91171,24 @@
                            , lib
                            , loop
                            , melpaBuild
-                           , s }:
+                           , s
+                           , spinner }:
       melpaBuild {
         pname = "suggest";
-        version = "20180421.1243";
+        ename = "suggest";
+        version = "20180722.350";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "a56b1ec98063ed88295311b5c1dde4a701a4596e";
-          sha256 = "1vbjrjlki30wrgnw4bhxchx961d5rpqkx14cmpd63pd3nf11dphi";
+          rev = "06784aba76d2681456871bd79304b62b4957b411";
+          sha256 = "0qi4slfdx0x9z2rzd2ibcl2zjqcrxvnh672l5xkyhjh873f16xar";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
           sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f loop s ];
+        packageRequires = [ dash emacs f loop s spinner ];
         meta = {
           homepage = "https://melpa.org/#/suggest";
           license = lib.licenses.free;
@@ -87709,6 +91202,7 @@
                                   , popup }:
       melpaBuild {
         pname = "suggestion-box";
+        ename = "suggestion-box";
         version = "20170830.107";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -87734,6 +91228,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "sunburn-theme";
+        ename = "sunburn-theme";
         version = "20180602.1229";
         src = fetchFromGitHub {
           owner = "mvarela";
@@ -87758,6 +91253,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "sunny-day-theme";
+        ename = "sunny-day-theme";
         version = "20140413.1425";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -87783,6 +91279,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sunshine";
+        ename = "sunshine";
         version = "20180325.548";
         src = fetchFromGitHub {
           owner = "aaronbieber";
@@ -87807,6 +91304,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "suomalainen-kalenteri";
+        ename = "suomalainen-kalenteri";
         version = "20170801.126";
         src = fetchFromGitHub {
           owner = "tlikonen";
@@ -87832,6 +91330,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "super-save";
+        ename = "super-save";
         version = "20171008.3";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -87856,6 +91355,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "supergenpass";
+        ename = "supergenpass";
         version = "20130328.2248";
         src = fetchFromGitHub {
           owner = "ober";
@@ -87880,6 +91380,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "suscolors-theme";
+        ename = "suscolors-theme";
         version = "20161109.1215";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
@@ -87905,6 +91406,7 @@
                                         , xmlgen }:
       melpaBuild {
         pname = "svg-mode-line-themes";
+        ename = "svg-mode-line-themes";
         version = "20150425.1306";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -87930,6 +91432,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "svnwrapper";
+        ename = "svnwrapper";
         version = "20180414.1143";
         src = fetchFromGitHub {
           owner = "Lindydancer";
@@ -87957,6 +91460,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "swagger-to-org";
+        ename = "swagger-to-org";
         version = "20160610.1756";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -87981,6 +91485,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "swap-buffers";
+        ename = "swap-buffers";
         version = "20150506.1439";
         src = fetchFromGitHub {
           owner = "ekazakov";
@@ -88006,6 +91511,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "swap-regions";
+        ename = "swap-regions";
         version = "20180116.253";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -88034,6 +91540,7 @@
                               , request }:
       melpaBuild {
         pname = "sweetgreen";
+        ename = "sweetgreen";
         version = "20180604.2035";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -88060,12 +91567,13 @@
                               , seq }:
       melpaBuild {
         pname = "swift-mode";
-        version = "20180610.2154";
+        ename = "swift-mode";
+        version = "20180721.35";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "7ea1d4e3b0430644b2e2b2e1025f442a10bfa523";
-          sha256 = "179wiwdxpkw7kbx2yss193l68cbmy93xdabw5sm35mv8px809j17";
+          rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080";
+          sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -88085,6 +91593,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "swift3-mode";
+        ename = "swift3-mode";
         version = "20160918.550";
         src = fetchFromGitHub {
           owner = "taku0";
@@ -88111,6 +91620,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "swiper";
+        ename = "swiper";
         version = "20180713.946";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -88138,6 +91648,7 @@
                                , swiper }:
       melpaBuild {
         pname = "swiper-helm";
+        ename = "swiper-helm";
         version = "20180131.944";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -88162,6 +91673,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "switch-buffer-functions";
+        ename = "switch-buffer-functions";
         version = "20171011.1004";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -88187,6 +91699,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "switch-window";
+        ename = "switch-window";
         version = "20180623.1115";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -88215,6 +91728,7 @@
                          , pcre2el }:
       melpaBuild {
         pname = "swoop";
+        ename = "swoop";
         version = "20160120.915";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -88239,6 +91753,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sws-mode";
+        ename = "sws-mode";
         version = "20150317.1245";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -88268,6 +91783,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "sx";
+        ename = "sx";
         version = "20180606.36";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -88293,6 +91809,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "symbol-overlay";
+        ename = "symbol-overlay";
         version = "20180412.339";
         src = fetchFromGitHub {
           owner = "wolray";
@@ -88319,6 +91836,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "symbolword-mode";
+        ename = "symbolword-mode";
         version = "20180401.727";
         src = fetchFromGitHub {
           owner = "ncaq";
@@ -88343,6 +91861,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "symon";
+        ename = "symon";
         version = "20170224.33";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -88369,6 +91888,7 @@
                                , symon }:
       melpaBuild {
         pname = "symon-lingr";
+        ename = "symon-lingr";
         version = "20150719.642";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -88393,6 +91913,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "sync-recentf";
+        ename = "sync-recentf";
         version = "20160326.1301";
         src = fetchFromGitHub {
           owner = "ffevotte";
@@ -88418,6 +91939,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "syndicate";
+        ename = "syndicate";
         version = "20160603.823";
         src = fetchFromGitHub {
           owner = "KNX32542";
@@ -88445,6 +91967,7 @@
                               , request }:
       melpaBuild {
         pname = "synonymous";
+        ename = "synonymous";
         version = "20180325.1117";
         src = fetchFromGitHub {
           owner = "toroidal-code";
@@ -88470,6 +91993,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "synosaurus";
+        ename = "synosaurus";
         version = "20180125.1034";
         src = fetchFromGitHub {
           owner = "hpdeifel";
@@ -88496,6 +92020,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "synquid";
+        ename = "synquid";
         version = "20160930.850";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -88522,12 +92047,13 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "syntactic-close";
-        version = "20180417.2339";
+        ename = "syntactic-close";
+        version = "20180722.935";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "815b01cb9d74db5d1671734fdfb9521616a4afb3";
-          sha256 = "1r6gac0n7pij1x7s27ifsbfmiqfbmynprcv1wicilhm90m6087iq";
+          rev = "128d5bf059512a55c77cac0e96a7775f38184139";
+          sha256 = "0l9hklj39p6rsl2dcw6pka39glkp6qvyccqdy7qcnwxmffy204m6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -88546,6 +92072,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "syntactic-sugar";
+        ename = "syntactic-sugar";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -88570,6 +92097,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "syntax-subword";
+        ename = "syntax-subword";
         version = "20160519.1205";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/syntax-subword";
@@ -88594,6 +92122,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "system-packages";
+        ename = "system-packages";
         version = "20180516.1450";
         src = fetchFromGitLab {
           owner = "jabranham";
@@ -88618,6 +92147,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "system-specific-settings";
+        ename = "system-specific-settings";
         version = "20140818.757";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -88643,6 +92173,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "systemd";
+        ename = "systemd";
         version = "20180629.1406";
         src = fetchFromGitHub {
           owner = "holomorph";
@@ -88667,6 +92198,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "systemtap-mode";
+        ename = "systemtap-mode";
         version = "20151122.1140";
         src = fetchFromGitHub {
           owner = "ruediger";
@@ -88693,6 +92225,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ta";
+        ename = "ta";
         version = "20160619.945";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -88717,6 +92250,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "tab-group";
+        ename = "tab-group";
         version = "20140306.650";
         src = fetchFromGitHub {
           owner = "tarao";
@@ -88743,6 +92277,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "tab-jump-out";
+        ename = "tab-jump-out";
         version = "20151005.1830";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -88767,6 +92302,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tabbar";
+        ename = "tabbar";
         version = "20160524.1401";
         src = fetchFromGitHub {
           owner = "dholm";
@@ -88795,6 +92331,7 @@
                                 , tabbar }:
       melpaBuild {
         pname = "tabbar-ruler";
+        ename = "tabbar-ruler";
         version = "20160801.2007";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -88820,6 +92357,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "tablist";
+        ename = "tablist";
         version = "20170219.1935";
         src = fetchFromGitHub {
           owner = "politza";
@@ -88845,6 +92383,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "tabula-rasa";
+        ename = "tabula-rasa";
         version = "20141215.2147";
         src = fetchFromGitHub {
           owner = "idomagal";
@@ -88871,6 +92410,7 @@
                            , s }:
       melpaBuild {
         pname = "tagedit";
+        ename = "tagedit";
         version = "20161121.55";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -88897,6 +92437,7 @@
                             , web-server }:
       melpaBuild {
         pname = "take-off";
+        ename = "take-off";
         version = "20140531.217";
         src = fetchFromGitHub {
           owner = "tburette";
@@ -88921,6 +92462,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "tango-2-theme";
+        ename = "tango-2-theme";
         version = "20120312.1325";
         src = fetchgit {
           url = "https://gist.github.com/2024464.git";
@@ -88944,6 +92486,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "tango-plus-theme";
+        ename = "tango-plus-theme";
         version = "20170214.908";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -88968,6 +92511,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "tangotango-theme";
+        ename = "tangotango-theme";
         version = "20170924.809";
         src = fetchFromGitHub {
           owner = "juba";
@@ -88992,6 +92536,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "tao-theme";
+        ename = "tao-theme";
         version = "20171221.1001";
         src = fetchFromGitHub {
           owner = "11111000000";
@@ -89016,6 +92561,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "taskpaper-mode";
+        ename = "taskpaper-mode";
         version = "20180710.158";
         src = fetchFromGitHub {
           owner = "saf-dmitry";
@@ -89042,6 +92588,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "tawny-mode";
+        ename = "tawny-mode";
         version = "20170422.1502";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -89070,6 +92617,7 @@
                          , tablist }:
       melpaBuild {
         pname = "tblui";
+        ename = "tblui";
         version = "20161007.1212";
         src = fetchFromGitHub {
           owner = "Yuki-Inoue";
@@ -89097,6 +92645,7 @@
                            , s }:
       melpaBuild {
         pname = "tbx2org";
+        ename = "tbx2org";
         version = "20140224.759";
         src = fetchFromGitHub {
           owner = "istib";
@@ -89115,6 +92664,30 @@
           license = lib.licenses.free;
         };
       }) {};
+    tc = callPackage ({ fetchFromGitHub
+                      , fetchurl
+                      , lib
+                      , melpaBuild }:
+      melpaBuild {
+        pname = "tc";
+        version = "20150113.1926";
+        src = fetchFromGitHub {
+          owner = "kozo2";
+          repo = "tc";
+          rev = "6aa9d27c475be8d009adf9cd417f2cdf348a91e8";
+          sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/55fa57c74237ec7afe651d162228fae595579fe5/recipes/tc";
+          sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
+          name = "tc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/tc";
+          license = lib.licenses.free;
+        };
+      }) {};
     tco = callPackage ({ dash
                        , emacs
                        , fetchFromGitHub
@@ -89123,6 +92696,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "tco";
+        ename = "tco";
         version = "20160810.1712";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -89147,6 +92721,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "tdd-status-mode-line";
+        ename = "tdd-status-mode-line";
         version = "20131123.916";
         src = fetchFromGitHub {
           owner = "algernon";
@@ -89171,6 +92746,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tea-time";
+        ename = "tea-time";
         version = "20120331.120";
         src = fetchFromGitHub {
           owner = "konzeptual";
@@ -89195,6 +92771,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "telepathy";
+        ename = "telepathy";
         version = "20131209.458";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -89223,6 +92800,7 @@
                                   , seq }:
       melpaBuild {
         pname = "telephone-line";
+        ename = "telephone-line";
         version = "20180601.1943";
         src = fetchFromGitHub {
           owner = "dbordak";
@@ -89249,6 +92827,7 @@
                                      , ov }:
       melpaBuild {
         pname = "template-overlays";
+        ename = "template-overlays";
         version = "20180706.432";
         src = fetchFromGitHub {
           owner = "mmontone";
@@ -89277,6 +92856,7 @@
                                         , s }:
       melpaBuild {
         pname = "temporary-persistent";
+        ename = "temporary-persistent";
         version = "20161210.333";
         src = fetchFromGitHub {
           owner = "kostafey";
@@ -89302,6 +92882,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ten-hundred-mode";
+        ename = "ten-hundred-mode";
         version = "20161028.1536";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -89330,6 +92911,7 @@
                               , term-cmd }:
       melpaBuild {
         pname = "term-alert";
+        ename = "term-alert";
         version = "20161119.145";
         src = fetchFromGitHub {
           owner = "CallumCameron";
@@ -89357,6 +92939,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "term-cmd";
+        ename = "term-cmd";
         version = "20160517.345";
         src = fetchFromGitHub {
           owner = "CallumCameron";
@@ -89383,6 +92966,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "term-manager";
+        ename = "term-manager";
         version = "20171020.141";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -89409,6 +92993,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "term-plus";
+        ename = "term+";
         version = "20170508.1717";
         src = fetchFromGitHub {
           owner = "tarao";
@@ -89435,6 +93020,7 @@
                                            , term-plus }:
       melpaBuild {
         pname = "term-plus-key-intercept";
+        ename = "term+key-intercept";
         version = "20140210.2350";
         src = fetchFromGitHub {
           owner = "tarao";
@@ -89461,6 +93047,7 @@
                                  , term-plus }:
       melpaBuild {
         pname = "term-plus-mux";
+        ename = "term+mux";
         version = "20140210.2349";
         src = fetchFromGitHub {
           owner = "tarao";
@@ -89488,6 +93075,7 @@
                                    , term-manager }:
       melpaBuild {
         pname = "term-projectile";
+        ename = "term-projectile";
         version = "20170421.105";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -89512,6 +93100,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "term-run";
+        ename = "term-run";
         version = "20151228.105";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -89537,6 +93126,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "termbright-theme";
+        ename = "termbright-theme";
         version = "20151030.1935";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -89563,6 +93153,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "terminal-here";
+        ename = "terminal-here";
         version = "20180513.133";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -89590,6 +93181,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "tern";
+        ename = "tern";
         version = "20170925.1333";
         src = fetchFromGitHub {
           owner = "ternjs";
@@ -89618,6 +93210,7 @@
                                       , tern }:
       melpaBuild {
         pname = "tern-auto-complete";
+        ename = "tern-auto-complete";
         version = "20170521.1235";
         src = fetchFromGitHub {
           owner = "ternjs";
@@ -89645,6 +93238,7 @@
                                          , tern }:
       melpaBuild {
         pname = "tern-context-coloring";
+        ename = "tern-context-coloring";
         version = "20161217.2347";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
@@ -89672,6 +93266,7 @@
                                , tern }:
       melpaBuild {
         pname = "tern-django";
+        ename = "tern-django";
         version = "20160221.1123";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -89698,6 +93293,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "terraform-mode";
+        ename = "terraform-mode";
         version = "20170111.2117";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -89723,6 +93319,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "test-c";
+        ename = "test-c";
         version = "20180423.1020";
         src = fetchFromGitHub {
           owner = "aaptel";
@@ -89748,6 +93345,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "test-case-mode";
+        ename = "test-case-mode";
         version = "20130525.734";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -89772,6 +93370,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "test-kitchen";
+        ename = "test-kitchen";
         version = "20171129.1235";
         src = fetchFromGitHub {
           owner = "jjasghar";
@@ -89797,6 +93396,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "test-simple";
+        ename = "test-simple";
         version = "20170527.832";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -89821,6 +93421,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "tex-smart-umlauts";
+        ename = "tex-smart-umlauts";
         version = "20160427.58";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -89847,6 +93448,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "texfrag";
+        ename = "texfrag";
         version = "20180318.1647";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
@@ -89871,6 +93473,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "textile-mode";
+        ename = "textile-mode";
         version = "20170304.916";
         src = fetchFromGitHub {
           owner = "juba";
@@ -89895,6 +93498,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "textmate";
+        ename = "textmate";
         version = "20110816.1446";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -89919,6 +93523,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "textmate-to-yas";
+        ename = "textmate-to-yas";
         version = "20160409.1008";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -89944,6 +93549,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "textx-mode";
+        ename = "textx-mode";
         version = "20170516.211";
         src = fetchFromGitHub {
           owner = "novakboskov";
@@ -89968,6 +93574,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "tf2-conf-mode";
+        ename = "tf2-conf-mode";
         version = "20161209.820";
         src = fetchFromGitHub {
           owner = "wynro";
@@ -89994,6 +93601,7 @@
                            , tablist }:
       melpaBuild {
         pname = "tfsmacs";
+        ename = "tfsmacs";
         version = "20180629.1011";
         src = fetchFromGitHub {
           owner = "sebasmonia";
@@ -90018,6 +93626,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "theme-changer";
+        ename = "theme-changer";
         version = "20171221.1127";
         src = fetchFromGitHub {
           owner = "hadronzoo";
@@ -90043,6 +93652,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "theme-looper";
+        ename = "theme-looper";
         version = "20170425.606";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -90068,6 +93678,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "therapy";
+        ename = "therapy";
         version = "20151113.1153";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -90092,6 +93703,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "thingopt";
+        ename = "thingopt";
         version = "20160520.1618";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -90117,6 +93729,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "thinks";
+        ename = "thinks";
         version = "20170802.428";
         src = fetchFromGitHub {
           owner = "davep";
@@ -90141,6 +93754,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "thread-dump";
+        ename = "thread-dump";
         version = "20170816.1150";
         src = fetchFromGitHub {
           owner = "nd";
@@ -90167,6 +93781,7 @@
                           , seq }:
       melpaBuild {
         pname = "threes";
+        ename = "threes";
         version = "20160820.542";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -90191,6 +93806,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "thrift";
+        ename = "thrift";
         version = "20140312.1348";
         src = fetchFromGitHub {
           owner = "apache";
@@ -90215,6 +93831,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "thumb-through";
+        ename = "thumb-through";
         version = "20120118.2134";
         src = fetchFromGitHub {
           owner = "apg";
@@ -90240,6 +93857,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "tickscript-mode";
+        ename = "tickscript-mode";
         version = "20171218.1803";
         src = fetchFromGitHub {
           owner = "msherry";
@@ -90266,6 +93884,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "tidal";
+        ename = "tidal";
         version = "20180410.1245";
         src = fetchFromGitHub {
           owner = "tidalcycles";
@@ -90295,6 +93914,7 @@
                         , typescript-mode }:
       melpaBuild {
         pname = "tide";
+        ename = "tide";
         version = "20180713.30";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -90323,6 +93943,7 @@
                         , stream }:
       melpaBuild {
         pname = "tile";
+        ename = "tile";
         version = "20161224.1957";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -90347,6 +93968,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "time-ext";
+        ename = "time-ext";
         version = "20170126.415";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -90373,6 +93995,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "timecop";
+        ename = "timecop";
         version = "20160520.352";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -90397,6 +94020,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "timer-revert";
+        ename = "timer-revert";
         version = "20150122.1232";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -90424,6 +94048,7 @@
                              , s }:
       melpaBuild {
         pname = "timesheet";
+        ename = "timesheet";
         version = "20160530.1445";
         src = fetchFromGitHub {
           owner = "tmarble";
@@ -90456,6 +94081,7 @@
                             , s }:
       melpaBuild {
         pname = "timonier";
+        ename = "timonier";
         version = "20170411.100";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -90493,6 +94119,7 @@
                         , signal }:
       melpaBuild {
         pname = "timp";
+        ename = "timp";
         version = "20160618.103";
         src = fetchFromGitHub {
           owner = "mola-T";
@@ -90518,6 +94145,7 @@
                             , s }:
       melpaBuild {
         pname = "tinkerer";
+        ename = "tinkerer";
         version = "20170906.524";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -90542,6 +94170,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "tiny";
+        ename = "tiny";
         version = "20170903.249";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -90567,6 +94196,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "tiny-menu";
+        ename = "tiny-menu";
         version = "20161213.435";
         src = fetchFromGitHub {
           owner = "aaronbieber";
@@ -90592,6 +94222,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "tinysegmenter";
+        ename = "tinysegmenter";
         version = "20141124.213";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -90616,6 +94247,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tj3-mode";
+        ename = "tj3-mode";
         version = "20180519.528";
         src = fetchFromGitHub {
           owner = "csrhodes";
@@ -90641,6 +94273,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "tldr";
+        ename = "tldr";
         version = "20180122.312";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -90665,6 +94298,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tmmofl";
+        ename = "tmmofl";
         version = "20121025.401";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -90689,6 +94323,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "toc-org";
+        ename = "toc-org";
         version = "20180613.840";
         src = fetchFromGitHub {
           owner = "snosov1";
@@ -90713,6 +94348,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "todotxt";
+        ename = "todotxt";
         version = "20180626.1530";
         src = fetchFromGitHub {
           owner = "rpdillon";
@@ -90737,6 +94373,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "todotxt-mode";
+        ename = "todotxt-mode";
         version = "20150424.704";
         src = fetchFromGitHub {
           owner = "avillafiorita";
@@ -90762,6 +94399,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "togetherly";
+        ename = "togetherly";
         version = "20170425.2316";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -90787,6 +94425,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "toggle";
+        ename = "toggle";
         version = "20180315.1703";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -90811,6 +94450,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "toggle-quotes";
+        ename = "toggle-quotes";
         version = "20140710.226";
         src = fetchFromGitHub {
           owner = "toctan";
@@ -90835,6 +94475,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "toggle-test";
+        ename = "toggle-test";
         version = "20140722.2237";
         src = fetchFromGitHub {
           owner = "rags";
@@ -90859,6 +94500,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "toggle-window";
+        ename = "toggle-window";
         version = "20141207.748";
         src = fetchFromGitHub {
           owner = "deadghost";
@@ -90883,6 +94525,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "tomatinho";
+        ename = "tomatinho";
         version = "20180621.1048";
         src = fetchFromGitHub {
           owner = "konr";
@@ -90907,6 +94550,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "toml";
+        ename = "toml";
         version = "20130903.555";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -90933,6 +94577,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "toml-mode";
+        ename = "toml-mode";
         version = "20161107.1000";
         src = fetchFromGitHub {
           owner = "dryman";
@@ -90957,6 +94602,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "tommyh-theme";
+        ename = "tommyh-theme";
         version = "20131004.1630";
         src = fetchFromGitHub {
           owner = "wglass";
@@ -90981,6 +94627,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "tornado-template-mode";
+        ename = "tornado-template-mode";
         version = "20141128.208";
         src = fetchFromGitHub {
           owner = "paradoxxxzero";
@@ -91006,6 +94653,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "total-lines";
+        ename = "total-lines";
         version = "20171227.439";
         src = fetchFromGitHub {
           owner = "hinrik";
@@ -91032,6 +94680,7 @@
                         , s }:
       melpaBuild {
         pname = "totd";
+        ename = "totd";
         version = "20150519.740";
         src = fetchFromGitLab {
           owner = "egh";
@@ -91056,6 +94705,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "tox";
+        ename = "tox";
         version = "20160810.855";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -91081,6 +94731,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "toxi-theme";
+        ename = "toxi-theme";
         version = "20160424.1426";
         src = fetchhg {
           url = "https://bitbucket.com/postspectacular/toxi-theme";
@@ -91105,6 +94756,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tql-mode";
+        ename = "tql-mode";
         version = "20170723.1954";
         src = fetchFromGitHub {
           owner = "tiros-dev";
@@ -91136,12 +94788,13 @@
                          , virtualenvwrapper }:
       melpaBuild {
         pname = "traad";
-        version = "20180711.226";
+        ename = "traad";
+        version = "20180720.512";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "7f628c62933b8252682c8550aee353699bf22c80";
-          sha256 = "05x5856733bz4ik33rp3f852f8m790g5q955rhsm42r8gzybdwfz";
+          rev = "1a4bb39dc36ac79fe540923096411e75a6dcfdf4";
+          sha256 = "0jj81p7v6qrqnlgyqdjygvzrid1phgrx5j4kfnsd3gy2k0i9k3vj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -91168,6 +94821,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tracking";
+        ename = "tracking";
         version = "20171210.1302";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -91193,6 +94847,7 @@
                                  , xml-rpc }:
       melpaBuild {
         pname = "tracwiki-mode";
+        ename = "tracwiki-mode";
         version = "20150119.821";
         src = fetchFromGitHub {
           owner = "merickson";
@@ -91218,6 +94873,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "tramp-hdfs";
+        ename = "tramp-hdfs";
         version = "20170821.620";
         src = fetchFromGitHub {
           owner = "raghavgautam";
@@ -91242,6 +94898,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "tramp-term";
+        ename = "tramp-term";
         version = "20180223.727";
         src = fetchFromGitHub {
           owner = "randymorris";
@@ -91267,6 +94924,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "transfer-sh";
+        ename = "transfer-sh";
         version = "20180603.731";
         src = fetchFromGitHub {
           owner = "Brillow";
@@ -91293,6 +94951,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "transmission";
+        ename = "transmission";
         version = "20180610.1653";
         src = fetchFromGitHub {
           owner = "holomorph";
@@ -91317,6 +94976,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "transpose-frame";
+        ename = "transpose-frame";
         version = "20151126.626";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -91341,6 +95001,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "transpose-mark";
+        ename = "transpose-mark";
         version = "20150405.16";
         src = fetchFromGitHub {
           owner = "kwrooijen";
@@ -91369,6 +95030,7 @@
                           , s }:
       melpaBuild {
         pname = "travis";
+        ename = "travis";
         version = "20150825.438";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -91393,6 +95055,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "tree-mode";
+        ename = "tree-mode";
         version = "20151104.531";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -91426,12 +95089,13 @@
                             , s }:
       melpaBuild {
         pname = "treemacs";
-        version = "20180715.543";
+        ename = "treemacs";
+        version = "20180722.503";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "94cd298929b0d6d7f3b2d7dc41a712f07c2cb0db";
-          sha256 = "1jnm9hiyj5hyi9mlfg51phvhjc15jz0p33vzl1w0y9xp9pwx14dp";
+          rev = "98d02cb1ca4742c6b3d7148c82109d4a0b0df27e";
+          sha256 = "0kk36i7d6pddx97zxpa37mz1pa7kygbyrqzl73mmx4cbisk3c2gw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
@@ -91452,6 +95116,7 @@
                                  , treemacs }:
       melpaBuild {
         pname = "treemacs-evil";
+        ename = "treemacs-evil";
         version = "20180622.426";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -91478,6 +95143,7 @@
                                        , treemacs }:
       melpaBuild {
         pname = "treemacs-projectile";
+        ename = "treemacs-projectile";
         version = "20180614.1021";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -91503,12 +95169,13 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "treepy";
-        version = "20170722.355";
+        ename = "treepy";
+        version = "20180722.538";
         src = fetchFromGitHub {
           owner = "volrath";
           repo = "treepy.el";
-          rev = "282fbc94747fe2a00d36e2a74d147c8fa0ac4be7";
-          sha256 = "0acw6c073h2a0fy8gx2xc2d1fw0yhaqikqrvs2iq53fqcqrrq81r";
+          rev = "ae972c73dbf56452a4fe5dca635a75c502a78a15";
+          sha256 = "1r3410v4y4zc6xdpf6z0947ivbw055zy1pcplr4215nr5346m6nc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
@@ -91531,6 +95198,7 @@
                                 , slime }:
       melpaBuild {
         pname = "trident-mode";
+        ename = "trident-mode";
         version = "20130726.1207";
         src = fetchFromGitHub {
           owner = "johnmastro";
@@ -91555,6 +95223,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "trr";
+        ename = "trr";
         version = "20170221.42";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -91580,6 +95249,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "truthy";
+        ename = "truthy";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -91605,6 +95275,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "try";
+        ename = "try";
         version = "20170226.805";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -91629,6 +95300,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ts-comint";
+        ename = "ts-comint";
         version = "20171105.2247";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -91657,6 +95329,7 @@
                        , yaxception }:
       melpaBuild {
         pname = "tss";
+        ename = "tss";
         version = "20150913.708";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -91681,6 +95354,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "tt-mode";
+        ename = "tt-mode";
         version = "20130804.410";
         src = fetchFromGitHub {
           owner = "davorg";
@@ -91705,6 +95379,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ttl-mode";
+        ename = "ttl-mode";
         version = "20160505.132";
         src = fetchhg {
           url = "https://bitbucket.com/nxg/ttl-mode";
@@ -91729,6 +95404,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tuareg";
+        ename = "tuareg";
         version = "20180512.1306";
         src = fetchFromGitHub {
           owner = "ocaml";
@@ -91755,6 +95431,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tumble";
+        ename = "tumble";
         version = "20160111.2329";
         src = fetchFromGitHub {
           owner = "febuiles";
@@ -91782,6 +95459,7 @@
                                , oauth }:
       melpaBuild {
         pname = "tumblesocks";
+        ename = "tumblesocks";
         version = "20140215.1247";
         src = fetchFromGitHub {
           owner = "gcr";
@@ -91806,6 +95484,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tup-mode";
+        ename = "tup-mode";
         version = "20140410.914";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -91831,6 +95510,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "turing-machine";
+        ename = "turing-machine";
         version = "20180221.2038";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
@@ -91855,6 +95535,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "turkish";
+        ename = "turkish";
         version = "20170910.811";
         src = fetchFromGitHub {
           owner = "emres";
@@ -91881,6 +95562,7 @@
                           , s }:
       melpaBuild {
         pname = "turnip";
+        ename = "turnip";
         version = "20150308.2329";
         src = fetchFromGitHub {
           owner = "kljohann";
@@ -91905,6 +95587,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "twig-mode";
+        ename = "twig-mode";
         version = "20130220.1050";
         src = fetchFromGitHub {
           owner = "moljac024";
@@ -91929,6 +95612,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "twilight-anti-bright-theme";
+        ename = "twilight-anti-bright-theme";
         version = "20160622.148";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -91953,6 +95637,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "twilight-bright-theme";
+        ename = "twilight-bright-theme";
         version = "20130605.143";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -91977,6 +95662,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "twilight-theme";
+        ename = "twilight-theme";
         version = "20120412.603";
         src = fetchFromGitHub {
           owner = "developernotes";
@@ -92001,6 +95687,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "twittering-mode";
+        ename = "twittering-mode";
         version = "20180507.721";
         src = fetchFromGitHub {
           owner = "hayamiz";
@@ -92027,6 +95714,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "typed-clojure-mode";
+        ename = "typed-clojure-mode";
         version = "20151003.1122";
         src = fetchFromGitHub {
           owner = "typedclojure";
@@ -92051,6 +95739,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "typescript-mode";
+        ename = "typescript-mode";
         version = "20180708.1003";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -92075,6 +95764,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "typing";
+        ename = "typing";
         version = "20171115.2331";
         src = fetchFromGitHub {
           owner = "kensanata";
@@ -92099,6 +95789,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "typing-game";
+        ename = "typing-game";
         version = "20160426.520";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -92126,6 +95817,7 @@
                          , mmt }:
       melpaBuild {
         pname = "typit";
+        ename = "typit";
         version = "20180317.107";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -92150,6 +95842,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "typo";
+        ename = "typo";
         version = "20171209.223";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -92176,6 +95869,7 @@
                                    , use-package }:
       melpaBuild {
         pname = "typoscript-mode";
+        ename = "typoscript-mode";
         version = "20170126.112";
         src = fetchFromGitHub {
           owner = "ksjogo";
@@ -92200,6 +95894,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ubuntu-theme";
+        ename = "ubuntu-theme";
         version = "20150805.806";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -92227,6 +95922,7 @@
                              , persistent-soft }:
       melpaBuild {
         pname = "ucs-utils";
+        ename = "ucs-utils";
         version = "20150826.714";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -92251,6 +95947,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "uimage";
+        ename = "uimage";
         version = "20160901.521";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -92275,6 +95972,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ujelly-theme";
+        ename = "ujelly-theme";
         version = "20180214.824";
         src = fetchFromGitHub {
           owner = "marktran";
@@ -92299,6 +95997,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ukrainian-holidays";
+        ename = "ukrainian-holidays";
         version = "20130720.649";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -92323,6 +96022,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "uncrustify-mode";
+        ename = "uncrustify-mode";
         version = "20130707.659";
         src = fetchFromGitHub {
           owner = "koko1000ban";
@@ -92350,6 +96050,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "undercover";
+        ename = "undercover";
         version = "20180403.752";
         src = fetchFromGitHub {
           owner = "sviridov";
@@ -92375,6 +96076,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "underline-with-char";
+        ename = "underline-with-char";
         version = "20170814.223";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -92399,6 +96101,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "underwater-theme";
+        ename = "underwater-theme";
         version = "20131117.1602";
         src = fetchFromGitHub {
           owner = "jmdeldin";
@@ -92424,6 +96127,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "undohist";
+        ename = "undohist";
         version = "20150315.542";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -92448,6 +96152,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "unfill";
+        ename = "unfill";
         version = "20170722.1846";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -92472,6 +96177,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "unicode-emoticons";
+        ename = "unicode-emoticons";
         version = "20150204.308";
         src = fetchFromGitHub {
           owner = "hagleitn";
@@ -92501,6 +96207,7 @@
                                  , ucs-utils }:
       melpaBuild {
         pname = "unicode-enbox";
+        ename = "unicode-enbox";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -92534,6 +96241,7 @@
                                   , names }:
       melpaBuild {
         pname = "unicode-escape";
+        ename = "unicode-escape";
         version = "20160614.534";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -92563,6 +96271,7 @@
                                  , ucs-utils }:
       melpaBuild {
         pname = "unicode-fonts";
+        ename = "unicode-fonts";
         version = "20150826.1532";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -92593,6 +96302,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "unicode-input";
+        ename = "unicode-input";
         version = "20141218.2320";
         src = fetchhg {
           url = "https://bitbucket.com/m00nlight/unicode-input";
@@ -92621,6 +96331,7 @@
                                              , ucs-utils }:
       melpaBuild {
         pname = "unicode-progress-reporter";
+        ename = "unicode-progress-reporter";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -92645,6 +96356,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "unicode-troll-stopper";
+        ename = "unicode-troll-stopper";
         version = "20151023.1831";
         src = fetchFromGitHub {
           owner = "camsaul";
@@ -92673,6 +96385,7 @@
                                       , ucs-utils }:
       melpaBuild {
         pname = "unicode-whitespace";
+        ename = "unicode-whitespace";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -92697,6 +96410,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "unidecode";
+        ename = "unidecode";
         version = "20180312.1226";
         src = fetchFromGitHub {
           owner = "sindikat";
@@ -92722,6 +96436,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "unify-opening";
+        ename = "unify-opening";
         version = "20171122.1212";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -92746,6 +96461,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "unipoint";
+        ename = "unipoint";
         version = "20140113.1424";
         src = fetchFromGitHub {
           owner = "apg";
@@ -92771,6 +96487,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "unison";
+        ename = "unison";
         version = "20160704.40";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -92795,6 +96512,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "unison-mode";
+        ename = "unison-mode";
         version = "20160513.801";
         src = fetchFromGitHub {
           owner = "impaktor";
@@ -92820,6 +96538,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "universal-emotions-emoticons";
+        ename = "universal-emotions-emoticons";
         version = "20171209.1820";
         src = fetchFromGitHub {
           owner = "grettke";
@@ -92844,6 +96563,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "unkillable-scratch";
+        ename = "unkillable-scratch";
         version = "20160504.1903";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -92870,6 +96590,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "untitled-new-buffer";
+        ename = "untitled-new-buffer";
         version = "20161212.708";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -92896,6 +96617,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "upbo";
+        ename = "upbo";
         version = "20180422.122";
         src = fetchFromGitHub {
           owner = "shiren";
@@ -92922,6 +96644,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "uptimes";
+        ename = "uptimes";
         version = "20180416.623";
         src = fetchFromGitHub {
           owner = "davep";
@@ -92946,6 +96669,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "url-shortener";
+        ename = "url-shortener";
         version = "20170804.1942";
         src = fetchFromGitHub {
           owner = "yuyang0";
@@ -92970,6 +96694,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "urlenc";
+        ename = "urlenc";
         version = "20140116.656";
         src = fetchFromGitHub {
           owner = "buzztaiki";
@@ -92994,6 +96719,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "usage-memo";
+        ename = "usage-memo";
         version = "20170925.1737";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -93020,6 +96746,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "use-package";
+        ename = "use-package";
         version = "20180715.1101";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -93048,6 +96775,7 @@
                                       , use-package }:
       melpaBuild {
         pname = "use-package-chords";
+        ename = "use-package-chords";
         version = "20180703.1258";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -93073,6 +96801,7 @@
                                       , use-package }:
       melpaBuild {
         pname = "use-package-el-get";
+        ename = "use-package-el-get";
         version = "20180130.2105";
         src = fetchFromGitHub {
           owner = "edvorg";
@@ -93099,6 +96828,7 @@
                                                      , use-package }:
       melpaBuild {
         pname = "use-package-ensure-system-package";
+        ename = "use-package-ensure-system-package";
         version = "20180710.29";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -93125,6 +96855,7 @@
                            , s }:
       melpaBuild {
         pname = "use-ttf";
+        ename = "use-ttf";
         version = "20180608.2252";
         src = fetchFromGitHub {
           owner = "jcs090218";
@@ -93150,6 +96881,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "usql";
+        ename = "usql";
         version = "20180305.1523";
         src = fetchFromGitHub {
           owner = "nickbarnwell";
@@ -93175,6 +96907,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "utop";
+        ename = "utop";
         version = "20180706.1549";
         src = fetchFromGitHub {
           owner = "diml";
@@ -93199,6 +96932,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "uuid";
+        ename = "uuid";
         version = "20120910.151";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -93223,6 +96957,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "uuidgen";
+        ename = "uuidgen";
         version = "20140918.1601";
         src = fetchFromGitHub {
           owner = "kanru";
@@ -93250,6 +96985,7 @@
                              , request }:
       melpaBuild {
         pname = "v2ex-mode";
+        ename = "v2ex-mode";
         version = "20160719.2045";
         src = fetchFromGitHub {
           owner = "aborn";
@@ -93274,6 +97010,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "vagrant";
+        ename = "vagrant";
         version = "20170301.1406";
         src = fetchFromGitHub {
           owner = "ottbot";
@@ -93299,6 +97036,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "vagrant-tramp";
+        ename = "vagrant-tramp";
         version = "20160427.1632";
         src = fetchFromGitHub {
           owner = "dougm";
@@ -93323,6 +97061,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "vala-mode";
+        ename = "vala-mode";
         version = "20150324.1525";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -93348,6 +97087,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "vala-snippets";
+        ename = "vala-snippets";
         version = "20150428.2052";
         src = fetchFromGitHub {
           owner = "gopar";
@@ -93375,6 +97115,7 @@
                             , yaxception }:
       melpaBuild {
         pname = "vbasense";
+        ename = "vbasense";
         version = "20140221.1553";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -93399,6 +97140,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "vc-auto-commit";
+        ename = "vc-auto-commit";
         version = "20170107.533";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -93423,6 +97165,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "vc-check-status";
+        ename = "vc-check-status";
         version = "20170107.534";
         src = fetchFromGitHub {
           owner = "thisirs";
@@ -93448,6 +97191,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "vc-darcs";
+        ename = "vc-darcs";
         version = "20170904.2020";
         src = fetchFromGitHub {
           owner = "velkyel";
@@ -93472,6 +97216,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "vc-fossil";
+        ename = "vc-fossil";
         version = "20180215.835";
         src = fetchFromGitHub {
           owner = "venks1";
@@ -93498,6 +97243,7 @@
                           , popup }:
       melpaBuild {
         pname = "vc-msg";
+        ename = "vc-msg";
         version = "20180604.1758";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -93522,6 +97268,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "vc-osc";
+        ename = "vc-osc";
         version = "20161119.1155";
         src = fetchFromGitHub {
           owner = "aspiers";
@@ -93546,6 +97293,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "vcl-mode";
+        ename = "vcl-mode";
         version = "20170119.1251";
         src = fetchFromGitHub {
           owner = "ssm";
@@ -93570,6 +97318,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "vcomp";
+        ename = "vcomp";
         version = "20140906.1508";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -93596,12 +97345,13 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "vdiff";
-        version = "20180627.615";
+        ename = "vdiff";
+        version = "20180719.1327";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "773e3ebde452cec9b37baa0d425ec4b51d9dc563";
-          sha256 = "1zwmcrmcixlpqyl0mnfgswv1h0g88mkph1ln3715fcv3xfd0vkrw";
+          rev = "40ffc92c566b55264f48167a02c17518743870b4";
+          sha256 = "0r17cw58yabrkjrqis5bz7ikr1lgczpzd7zz895fzqrg4n901bj5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -93623,12 +97373,13 @@
                                , vdiff }:
       melpaBuild {
         pname = "vdiff-magit";
-        version = "20170519.1407";
+        ename = "vdiff-magit";
+        version = "20180719.1401";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff-magit";
-          rev = "1ccf0a8be5aad18648fd59c775a8dd6070398b74";
-          sha256 = "1skcrpfgz2c9s9r2xvwanrvyczcqjgmjrwjm188d55l4pn8ylr83";
+          rev = "73912622680ce761779158526e993933a2dbcb9e";
+          sha256 = "1vcqfi94xs0ri5zv5h1pw8i0jy1gbx8811i2fshw70f1rmlzmaid";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
@@ -93651,6 +97402,7 @@
                           , seq }:
       melpaBuild {
         pname = "vdirel";
+        ename = "vdirel";
         version = "20170605.43";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -93675,6 +97427,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "vector-utils";
+        ename = "vector-utils";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -93700,6 +97453,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "verify-url";
+        ename = "verify-url";
         version = "20160426.528";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -93725,6 +97479,7 @@
                            , sql ? null }:
       melpaBuild {
         pname = "vertica";
+        ename = "vertica";
         version = "20131217.711";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -93750,6 +97505,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "vertica-snippets";
+        ename = "vertica-snippets";
         version = "20180208.154";
         src = fetchFromGitHub {
           owner = "baron42bba";
@@ -93775,6 +97531,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "vertigo";
+        ename = "vertigo";
         version = "20180408.920";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -93799,6 +97556,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "vhdl-capf";
+        ename = "vhdl-capf";
         version = "20160221.934";
         src = fetchFromGitHub {
           owner = "sh-ow";
@@ -93827,6 +97585,7 @@
                               , outshine }:
       melpaBuild {
         pname = "vhdl-tools";
+        ename = "vhdl-tools";
         version = "20180610.958";
         src = fetchFromGitHub {
           owner = "csantosb";
@@ -93852,6 +97611,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "vi-tilde-fringe";
+        ename = "vi-tilde-fringe";
         version = "20141027.1942";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -93876,6 +97636,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "viewer";
+        ename = "viewer";
         version = "20170106.1802";
         src = fetchFromGitHub {
           owner = "rubikitch";
@@ -93900,6 +97661,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "viking-mode";
+        ename = "viking-mode";
         version = "20160705.1327";
         src = fetchFromGitHub {
           owner = "tlinden";
@@ -93925,6 +97687,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "vim-empty-lines-mode";
+        ename = "vim-empty-lines-mode";
         version = "20150110.2026";
         src = fetchFromGitHub {
           owner = "jmickelin";
@@ -93950,6 +97713,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "vim-region";
+        ename = "vim-region";
         version = "20140329.924";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -93977,6 +97741,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "vimish-fold";
+        ename = "vimish-fold";
         version = "20171231.2212";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -94001,6 +97766,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "vimrc-mode";
+        ename = "vimrc-mode";
         version = "20170814.1837";
         src = fetchFromGitHub {
           owner = "mcandre";
@@ -94025,6 +97791,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "virtualenv";
+        ename = "virtualenv";
         version = "20140220.1501";
         src = fetchFromGitHub {
           owner = "aculich";
@@ -94051,6 +97818,7 @@
                                      , s }:
       melpaBuild {
         pname = "virtualenvwrapper";
+        ename = "virtualenvwrapper";
         version = "20180211.1744";
         src = fetchFromGitHub {
           owner = "porterjamesj";
@@ -94075,6 +97843,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "visible-mark";
+        ename = "visible-mark";
         version = "20150623.2150";
         src = fetchFromGitLab {
           owner = "iankelling";
@@ -94099,6 +97868,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "visual-ascii-mode";
+        ename = "visual-ascii-mode";
         version = "20150129.246";
         src = fetchFromGitHub {
           owner = "Dewdrops";
@@ -94124,6 +97894,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "visual-fill-column";
+        ename = "visual-fill-column";
         version = "20180511.211";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -94149,6 +97920,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "visual-regexp";
+        ename = "visual-regexp";
         version = "20170228.1716";
         src = fetchFromGitHub {
           owner = "benma";
@@ -94174,6 +97946,7 @@
                                           , visual-regexp }:
       melpaBuild {
         pname = "visual-regexp-steroids";
+        ename = "visual-regexp-steroids";
         version = "20170221.1853";
         src = fetchFromGitHub {
           owner = "benma";
@@ -94198,6 +97971,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "vlf";
+        ename = "vlf";
         version = "20180201.1454";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -94223,6 +97997,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "vmd-mode";
+        ename = "vmd-mode";
         version = "20180223.556";
         src = fetchFromGitHub {
           owner = "blak3mill3r";
@@ -94248,6 +98023,7 @@
                                 , popup }:
       melpaBuild {
         pname = "voca-builder";
+        ename = "voca-builder";
         version = "20161101.945";
         src = fetchFromGitHub {
           owner = "yitang";
@@ -94272,6 +98048,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "volatile-highlights";
+        ename = "volatile-highlights";
         version = "20160611.1855";
         src = fetchFromGitHub {
           owner = "k-talo";
@@ -94296,6 +98073,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "volume";
+        ename = "volume";
         version = "20150718.1309";
         src = fetchFromGitHub {
           owner = "dbrock";
@@ -94320,6 +98098,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "vue-html-mode";
+        ename = "vue-html-mode";
         version = "20180428.1335";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -94348,6 +98127,7 @@
                             , vue-html-mode }:
       melpaBuild {
         pname = "vue-mode";
+        ename = "vue-mode";
         version = "20180515.2012";
         src = fetchFromGitHub {
           owner = "CodeFalling";
@@ -94373,6 +98153,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "vyper-mode";
+        ename = "vyper-mode";
         version = "20180707.1235";
         src = fetchFromGitHub {
           owner = "ralexstokes";
@@ -94397,6 +98178,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "w32-browser";
+        ename = "w32-browser";
         version = "20170101.1154";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -94421,6 +98203,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "w3m";
+        ename = "w3m";
         version = "20180404.2220";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -94447,6 +98230,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "wacspace";
+        ename = "wacspace";
         version = "20180311.1650";
         src = fetchFromGitHub {
           owner = "shosti";
@@ -94471,6 +98255,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "waf-mode";
+        ename = "waf-mode";
         version = "20170403.1240";
         src = fetchgit {
           url = "https://bitbucket.org/dvalchuk/waf-mode";
@@ -94495,6 +98280,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "waher-theme";
+        ename = "waher-theme";
         version = "20141115.430";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -94519,6 +98305,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "wakatime-mode";
+        ename = "wakatime-mode";
         version = "20170517.2053";
         src = fetchFromGitHub {
           owner = "wakatime";
@@ -94544,6 +98331,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "wakib-keys";
+        ename = "wakib-keys";
         version = "20180610.1952";
         src = fetchFromGitHub {
           owner = "darkstego";
@@ -94570,6 +98358,7 @@
                         , s }:
       melpaBuild {
         pname = "wand";
+        ename = "wand";
         version = "20180112.454";
         src = fetchFromGitHub {
           owner = "cmpitg";
@@ -94597,6 +98386,7 @@
                            , s }:
       melpaBuild {
         pname = "wandbox";
+        ename = "wandbox";
         version = "20170603.531";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -94622,6 +98412,7 @@
                               , semi }:
       melpaBuild {
         pname = "wanderlust";
+        ename = "wanderlust";
         version = "20180605.631";
         src = fetchFromGitHub {
           owner = "wanderlust";
@@ -94647,6 +98438,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "warm-night-theme";
+        ename = "warm-night-theme";
         version = "20161101.728";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -94671,6 +98463,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "watch-buffer";
+        ename = "watch-buffer";
         version = "20120331.1344";
         src = fetchFromGitHub {
           owner = "mjsteger";
@@ -94695,6 +98488,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "wavefront-obj-mode";
+        ename = "wavefront-obj-mode";
         version = "20170808.1016";
         src = fetchFromGitHub {
           owner = "abend";
@@ -94719,6 +98513,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "wc-goal-mode";
+        ename = "wc-goal-mode";
         version = "20140829.659";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -94743,6 +98538,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wc-mode";
+        ename = "wc-mode";
         version = "20170126.2029";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -94767,6 +98563,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wcheck-mode";
+        ename = "wcheck-mode";
         version = "20180126.416";
         src = fetchFromGitHub {
           owner = "tlikonen";
@@ -94793,6 +98590,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "weather-metno";
+        ename = "weather-metno";
         version = "20150831.1807";
         src = fetchFromGitHub {
           owner = "ruediger";
@@ -94819,6 +98617,7 @@
                        , s }:
       melpaBuild {
         pname = "web";
+        ename = "web";
         version = "20141231.1201";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -94843,6 +98642,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "web-beautify";
+        ename = "web-beautify";
         version = "20161115.1447";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -94867,6 +98667,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "web-completion-data";
+        ename = "web-completion-data";
         version = "20160318.148";
         src = fetchFromGitHub {
           owner = "osv";
@@ -94892,6 +98693,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "web-mode";
+        ename = "web-mode";
         version = "20180628.422";
         src = fetchFromGitHub {
           owner = "fxbois";
@@ -94918,6 +98720,7 @@
                                          , web-mode }:
       melpaBuild {
         pname = "web-mode-edit-element";
+        ename = "web-mode-edit-element";
         version = "20161114.954";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
@@ -94943,6 +98746,7 @@
                                    , web-mode }:
       melpaBuild {
         pname = "web-narrow-mode";
+        ename = "web-narrow-mode";
         version = "20170406.1910";
         src = fetchFromGitHub {
           owner = "Qquanwei";
@@ -94968,6 +98772,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "web-search";
+        ename = "web-search";
         version = "20170911.1246";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -94993,6 +98798,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "web-server";
+        ename = "web-server";
         version = "20140905.1706";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -95019,6 +98825,7 @@
                                        , posframe }:
       melpaBuild {
         pname = "webkit-color-picker";
+        ename = "webkit-color-picker";
         version = "20180325.36";
         src = fetchFromGitHub {
           owner = "osener";
@@ -95044,6 +98851,7 @@
                              , xml-rpc }:
       melpaBuild {
         pname = "weblogger";
+        ename = "weblogger";
         version = "20110926.918";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -95071,6 +98879,7 @@
                             , request }:
       melpaBuild {
         pname = "webpaste";
+        ename = "webpaste";
         version = "20180127.1434";
         src = fetchFromGitHub {
           owner = "etu";
@@ -95096,6 +98905,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "websocket";
+        ename = "websocket";
         version = "20180422.1716";
         src = fetchFromGitHub {
           owner = "ahyatt";
@@ -95120,6 +98930,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "wedge-ws";
+        ename = "wedge-ws";
         version = "20140714.1449";
         src = fetchFromGitHub {
           owner = "aes";
@@ -95148,6 +98959,7 @@
                            , tracking }:
       melpaBuild {
         pname = "weechat";
+        ename = "weechat";
         version = "20180513.310";
         src = fetchFromGitHub {
           owner = "the-kenny";
@@ -95175,6 +98987,7 @@
                                  , weechat }:
       melpaBuild {
         pname = "weechat-alert";
+        ename = "weechat-alert";
         version = "20160416.548";
         src = fetchFromGitHub {
           owner = "Kungi";
@@ -95200,6 +99013,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "weibo";
+        ename = "weibo";
         version = "20150307.1442";
         src = fetchFromGitHub {
           owner = "austin-----";
@@ -95224,6 +99038,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "wgrep";
+        ename = "wgrep";
         version = "20180710.2326";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -95249,6 +99064,7 @@
                              , wgrep }:
       melpaBuild {
         pname = "wgrep-ack";
+        ename = "wgrep-ack";
         version = "20141012.311";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -95275,6 +99091,7 @@
                             , wgrep }:
       melpaBuild {
         pname = "wgrep-ag";
+        ename = "wgrep-ag";
         version = "20160923.403";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -95300,6 +99117,7 @@
                               , wgrep }:
       melpaBuild {
         pname = "wgrep-helm";
+        ename = "wgrep-helm";
         version = "20170510.1539";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -95325,6 +99143,7 @@
                             , wgrep }:
       melpaBuild {
         pname = "wgrep-pt";
+        ename = "wgrep-pt";
         version = "20140510.1531";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -95349,6 +99168,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "what-the-commit";
+        ename = "what-the-commit";
         version = "20150901.616";
         src = fetchFromGitHub {
           owner = "danielbarbarito";
@@ -95374,6 +99194,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "which-key";
+        ename = "which-key";
         version = "20180621.1238";
         src = fetchFromGitHub {
           owner = "justbur";
@@ -95399,6 +99220,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "whitaker";
+        ename = "whitaker";
         version = "20150814.422";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -95424,6 +99246,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "white-sand-theme";
+        ename = "white-sand-theme";
         version = "20151117.848";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -95449,6 +99272,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "white-theme";
+        ename = "white-theme";
         version = "20160917.1043";
         src = fetchFromGitHub {
           owner = "anler";
@@ -95473,6 +99297,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "whitespace-cleanup-mode";
+        ename = "whitespace-cleanup-mode";
         version = "20170505.1923";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -95498,6 +99323,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "whizzml-mode";
+        ename = "whizzml-mode";
         version = "20180711.910";
         src = fetchFromGitHub {
           owner = "whizzml";
@@ -95522,6 +99348,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "whole-line-or-region";
+        ename = "whole-line-or-region";
         version = "20180324.2119";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -95546,6 +99373,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wide-column";
+        ename = "wide-column";
         version = "20170925.913";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -95570,6 +99398,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "widget-mvc";
+        ename = "widget-mvc";
         version = "20150101.2006";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -95598,6 +99427,7 @@
                             , s }:
       melpaBuild {
         pname = "widgetjs";
+        ename = "widgetjs";
         version = "20160719.804";
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
@@ -95624,6 +99454,7 @@
                             , nav-flash }:
       melpaBuild {
         pname = "wiki-nav";
+        ename = "wiki-nav";
         version = "20150223.554";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -95649,6 +99480,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "wiki-summary";
+        ename = "wiki-summary";
         version = "20150408.1422";
         src = fetchFromGitHub {
           owner = "jozefg";
@@ -95676,6 +99508,7 @@
                         , s }:
       melpaBuild {
         pname = "wilt";
+        ename = "wilt";
         version = "20180220.54";
         src = fetchFromGitHub {
           owner = "sixty-north";
@@ -95700,6 +99533,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "win-switch";
+        ename = "win-switch";
         version = "20161009.927";
         src = fetchFromGitHub {
           owner = "genovese";
@@ -95724,6 +99558,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "windata";
+        ename = "windata";
         version = "20090830.340";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -95748,6 +99583,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "window-end-visible";
+        ename = "window-end-visible";
         version = "20140508.1341";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -95772,6 +99608,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "window-jump";
+        ename = "window-jump";
         version = "20170809.1508";
         src = fetchFromGitHub {
           owner = "chumpage";
@@ -95796,6 +99633,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "window-layout";
+        ename = "window-layout";
         version = "20170214.1633";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -95820,6 +99658,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "window-number";
+        ename = "window-number";
         version = "20170731.1851";
         src = fetchFromGitHub {
           owner = "nikolas";
@@ -95844,6 +99683,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "window-numbering";
+        ename = "window-numbering";
         version = "20160809.1110";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -95872,6 +99712,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "window-purpose";
+        ename = "window-purpose";
         version = "20180531.1336";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -95896,6 +99737,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "windsize";
+        ename = "windsize";
         version = "20151121.540";
         src = fetchFromGitHub {
           owner = "grammati";
@@ -95923,6 +99765,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "windwow";
+        ename = "windwow";
         version = "20170815.1848";
         src = fetchFromGitHub {
           owner = "vijumathew";
@@ -95948,6 +99791,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "winnow";
+        ename = "winnow";
         version = "20170903.506";
         src = fetchFromGitHub {
           owner = "dgtized";
@@ -95972,6 +99816,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "winpoint";
+        ename = "winpoint";
         version = "20131023.1013";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -95996,6 +99841,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "winring";
+        ename = "winring";
         version = "20180529.1718";
         src = fetchFromGitLab {
           owner = "warsaw";
@@ -96022,6 +99868,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "winum";
+        ename = "winum";
         version = "20171028.702";
         src = fetchFromGitHub {
           owner = "deb0ch";
@@ -96046,6 +99893,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "wisp-mode";
+        ename = "wisp-mode";
         version = "20180520.58";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
@@ -96070,6 +99918,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wispjs-mode";
+        ename = "wispjs-mode";
         version = "20170720.1219";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -96096,6 +99945,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "with-editor";
+        ename = "with-editor";
         version = "20180618.1602";
         src = fetchFromGitHub {
           owner = "magit";
@@ -96122,6 +99972,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "with-namespace";
+        ename = "with-namespace";
         version = "20130407.1122";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -96149,6 +100000,7 @@
                                         , seq }:
       melpaBuild {
         pname = "with-simulated-input";
+        ename = "with-simulated-input";
         version = "20170820.2317";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -96174,6 +100026,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wn-mode";
+        ename = "wn-mode";
         version = "20151109.2152";
         src = fetchFromGitHub {
           owner = "luismbo";
@@ -96198,6 +100051,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wolfram";
+        ename = "wolfram";
         version = "20170122.2356";
         src = fetchFromGitHub {
           owner = "hsjunnesson";
@@ -96223,6 +100077,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "wolfram-mode";
+        ename = "wolfram-mode";
         version = "20180306.1613";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -96251,6 +100106,7 @@
                               , multi }:
       melpaBuild {
         pname = "wonderland";
+        ename = "wonderland";
         version = "20130912.1819";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
@@ -96277,6 +100133,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wordgen";
+        ename = "wordgen";
         version = "20170803.1120";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -96302,6 +100159,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wordnut";
+        ename = "wordnut";
         version = "20180312.2143";
         src = fetchFromGitHub {
           owner = "gromnitsky";
@@ -96326,6 +100184,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "wordsmith-mode";
+        ename = "wordsmith-mode";
         version = "20171025.730";
         src = fetchFromGitHub {
           owner = "istib";
@@ -96354,6 +100213,7 @@
                         , zoutline }:
       melpaBuild {
         pname = "worf";
+        ename = "worf";
         version = "20180620.1011";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -96378,6 +100238,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "workgroups";
+        ename = "workgroups";
         version = "20110726.941";
         src = fetchFromGitHub {
           owner = "tlh";
@@ -96406,6 +100267,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "workgroups2";
+        ename = "workgroups2";
         version = "20141102.1122";
         src = fetchFromGitHub {
           owner = "pashinin";
@@ -96430,6 +100292,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "world-time-mode";
+        ename = "world-time-mode";
         version = "20140627.107";
         src = fetchFromGitHub {
           owner = "nicferrier";
@@ -96456,6 +100319,7 @@
                         , org }:
       melpaBuild {
         pname = "wotd";
+        ename = "wotd";
         version = "20170328.1248";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -96481,6 +100345,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wrap-region";
+        ename = "wrap-region";
         version = "20140116.2320";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -96505,6 +100370,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "writegood-mode";
+        ename = "writegood-mode";
         version = "20180525.643";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -96531,6 +100397,7 @@
                                   , visual-fill-column }:
       melpaBuild {
         pname = "writeroom-mode";
+        ename = "writeroom-mode";
         version = "20170623.327";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -96555,6 +100422,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ws-butler";
+        ename = "ws-butler";
         version = "20170111.1534";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -96579,6 +100447,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "wsd-mode";
+        ename = "wsd-mode";
         version = "20170731.837";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -96605,6 +100474,7 @@
                           , xterm-color }:
       melpaBuild {
         pname = "wttrin";
+        ename = "wttrin";
         version = "20170614.506";
         src = fetchFromGitHub {
           owner = "bcbcarl";
@@ -96629,6 +100499,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "wwtime";
+        ename = "wwtime";
         version = "20151122.810";
         src = fetchFromGitHub {
           owner = "ndw";
@@ -96655,6 +100526,7 @@
                                 , request }:
       melpaBuild {
         pname = "www-synonyms";
+        ename = "www-synonyms";
         version = "20170128.1451";
         src = fetchFromGitHub {
           owner = "spebern";
@@ -96680,6 +100552,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "x-path-walker";
+        ename = "x-path-walker";
         version = "20160922.1135";
         src = fetchFromGitHub {
           owner = "lompik";
@@ -96706,6 +100579,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "x509-mode";
+        ename = "x509-mode";
         version = "20180702.36";
         src = fetchFromGitHub {
           owner = "jobbflykt";
@@ -96732,6 +100606,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "x86-lookup";
+        ename = "x86-lookup";
         version = "20180528.935";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -96757,6 +100632,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "xah-css-mode";
+        ename = "xah-css-mode";
         version = "20180629.107";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96782,6 +100658,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "xah-elisp-mode";
+        ename = "xah-elisp-mode";
         version = "20180710.124";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96807,6 +100684,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xah-find";
+        ename = "xah-find";
         version = "20180310.450";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96832,6 +100710,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "xah-fly-keys";
+        ename = "xah-fly-keys";
         version = "20180702.1521";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96857,6 +100736,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "xah-get-thing";
+        ename = "xah-get-thing";
         version = "20170821.353";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96882,6 +100762,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "xah-lookup";
+        ename = "xah-lookup";
         version = "20171108.241";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96907,6 +100788,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "xah-math-input";
+        ename = "xah-math-input";
         version = "20180709.2228";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96931,6 +100813,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "xah-reformat-code";
+        ename = "xah-reformat-code";
         version = "20170821.411";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96956,6 +100839,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "xah-replace-pairs";
+        ename = "xah-replace-pairs";
         version = "20180507.1949";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -96981,6 +100865,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "xahk-mode";
+        ename = "xahk-mode";
         version = "20170821.407";
         src = fetchFromGitHub {
           owner = "xahlee";
@@ -97005,6 +100890,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xbm-life";
+        ename = "xbm-life";
         version = "20160103.217";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -97033,6 +100919,7 @@
                               , s }:
       melpaBuild {
         pname = "xcode-mode";
+        ename = "xcode-mode";
         version = "20160907.508";
         src = fetchFromGitHub {
           owner = "nicklanasa";
@@ -97058,6 +100945,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "xcode-project";
+        ename = "xcode-project";
         version = "20180509.1218";
         src = fetchFromGitHub {
           owner = "nhojb";
@@ -97082,6 +100970,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "xcscope";
+        ename = "xcscope";
         version = "20180426.12";
         src = fetchFromGitHub {
           owner = "dkogan";
@@ -97107,6 +100996,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "xkcd";
+        ename = "xkcd";
         version = "20160419.430";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -97133,6 +101023,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xml-plus";
+        ename = "xml+";
         version = "20170727.1651";
         src = fetchFromGitHub {
           owner = "bddean";
@@ -97157,6 +101048,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "xml-quotes";
+        ename = "xml-quotes";
         version = "20151230.1449";
         src = fetchFromGitHub {
           owner = "ndw";
@@ -97181,6 +101073,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "xml-rpc";
+        ename = "xml-rpc";
         version = "20160430.1458";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -97205,6 +101098,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "xmlgen";
+        ename = "xmlgen";
         version = "20170411.617";
         src = fetchFromGitHub {
           owner = "philjackson";
@@ -97229,6 +101123,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "xmlunicode";
+        ename = "xmlunicode";
         version = "20160319.912";
         src = fetchFromGitHub {
           owner = "ndw";
@@ -97253,6 +101148,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "xo";
+        ename = "xo";
         version = "20160402.2346";
         src = fetchFromGitHub {
           owner = "j-em";
@@ -97278,6 +101174,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "xquery-mode";
+        ename = "xquery-mode";
         version = "20170214.319";
         src = fetchFromGitHub {
           owner = "xquery-mode";
@@ -97302,6 +101199,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "xquery-tool";
+        ename = "xquery-tool";
         version = "20170605.126";
         src = fetchFromGitHub {
           owner = "paddymcall";
@@ -97328,6 +101226,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xref-js2";
+        ename = "xref-js2";
         version = "20170530.126";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -97352,6 +101251,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "xresources-theme";
+        ename = "xresources-theme";
         version = "20160331.702";
         src = fetchFromGitHub {
           owner = "CQQL";
@@ -97377,6 +101277,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "xterm-color";
+        ename = "xterm-color";
         version = "20180202.1518";
         src = fetchFromGitHub {
           owner = "atomontage";
@@ -97404,6 +101305,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "xterm-keybinder";
+        ename = "xterm-keybinder";
         version = "20160522.1756";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -97429,6 +101331,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "xtest";
+        ename = "xtest";
         version = "20141214.906";
         src = fetchFromGitHub {
           owner = "promethial";
@@ -97454,6 +101357,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xwidgete";
+        ename = "xwidgete";
         version = "20171118.1316";
         src = fetchFromGitHub {
           owner = "tuhdo";
@@ -97478,6 +101382,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "yabin";
+        ename = "yabin";
         version = "20140205.1951";
         src = fetchFromGitHub {
           owner = "d5884";
@@ -97502,6 +101407,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yafolding";
+        ename = "yafolding";
         version = "20170304.1917";
         src = fetchFromGitHub {
           owner = "zenozeng";
@@ -97527,6 +101433,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "yagist";
+        ename = "yagist";
         version = "20160417.2208";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -97552,6 +101459,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "yahoo-weather";
+        ename = "yahoo-weather";
         version = "20170822.1544";
         src = fetchFromGitHub {
           owner = "lujun9972";
@@ -97577,6 +101485,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yahtzee";
+        ename = "yahtzee";
         version = "20171022.712";
         src = fetchFromGitHub {
           owner = "drdv";
@@ -97601,6 +101510,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yalinum";
+        ename = "yalinum";
         version = "20130217.243";
         src = fetchFromGitHub {
           owner = "tm8st";
@@ -97626,6 +101536,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yaml-mode";
+        ename = "yaml-mode";
         version = "20180408.2307";
         src = fetchFromGitHub {
           owner = "yoshiki";
@@ -97651,6 +101562,7 @@
                                , s }:
       melpaBuild {
         pname = "yaml-tomato";
+        ename = "yaml-tomato";
         version = "20151122.2353";
         src = fetchFromGitHub {
           owner = "RadekMolenda";
@@ -97675,6 +101587,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "yandex-weather";
+        ename = "yandex-weather";
         version = "20160311.1237";
         src = fetchFromGitHub {
           owner = "abstractionlayer";
@@ -97699,6 +101612,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yang-mode";
+        ename = "yang-mode";
         version = "20180306.407";
         src = fetchFromGitHub {
           owner = "mbj4668";
@@ -97724,6 +101638,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yankpad";
+        ename = "yankpad";
         version = "20180624.1615";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -97748,6 +101663,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yapfify";
+        ename = "yapfify";
         version = "20180105.1447";
         src = fetchFromGitHub {
           owner = "JorisE";
@@ -97773,6 +101689,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yara-mode";
+        ename = "yara-mode";
         version = "20170719.2351";
         src = fetchFromGitHub {
           owner = "binjo";
@@ -97797,6 +101714,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yard-mode";
+        ename = "yard-mode";
         version = "20170817.537";
         src = fetchFromGitHub {
           owner = "pd";
@@ -97821,6 +101739,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "yari";
+        ename = "yari";
         version = "20151127.2339";
         src = fetchFromGitHub {
           owner = "hron";
@@ -97846,6 +101765,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yarn-mode";
+        ename = "yarn-mode";
         version = "20170709.1237";
         src = fetchFromGitHub {
           owner = "anachronic";
@@ -97871,6 +101791,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "yascroll";
+        ename = "yascroll";
         version = "20170315.1206";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -97896,6 +101817,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yasnippet";
+        ename = "yasnippet";
         version = "20180620.1750";
         src = fetchFromGitHub {
           owner = "joaotavora";
@@ -97921,6 +101843,7 @@
                                       , yasnippet }:
       melpaBuild {
         pname = "yasnippet-snippets";
+        ename = "yasnippet-snippets";
         version = "20180714.622";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
@@ -97947,6 +101870,7 @@
                               , yasnippet }:
       melpaBuild {
         pname = "yatemplate";
+        ename = "yatemplate";
         version = "20180617.252";
         src = fetchFromGitHub {
           owner = "mineo";
@@ -97971,6 +101895,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "yatex";
+        ename = "yatex";
         version = "20180601.2357";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex";
@@ -97994,6 +101919,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "yaxception";
+        ename = "yaxception";
         version = "20150105.652";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -98018,6 +101944,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ycm";
+        ename = "ycm";
         version = "20150822.1136";
         src = fetchFromGitHub {
           owner = "neuromage";
@@ -98051,6 +101978,7 @@
                         , s }:
       melpaBuild {
         pname = "ycmd";
+        ename = "ycmd";
         version = "20180520.353";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -98085,6 +102013,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ydk-mode";
+        ename = "ydk-mode";
         version = "20170113.121";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
@@ -98112,6 +102041,7 @@
                                 , s }:
       melpaBuild {
         pname = "yesql-ghosts";
+        ename = "yesql-ghosts";
         version = "20150220.437";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -98136,6 +102066,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yoficator";
+        ename = "yoficator";
         version = "20180129.1252";
         src = fetchFromGitLab {
           owner = "link2xt";
@@ -98160,6 +102091,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "yoshi-theme";
+        ename = "yoshi-theme";
         version = "20170330.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -98189,6 +102121,7 @@
                                      , pos-tip }:
       melpaBuild {
         pname = "youdao-dictionary";
+        ename = "youdao-dictionary";
         version = "20180713.2114";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -98215,6 +102148,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "z3-mode";
+        ename = "z3-mode";
         version = "20151120.1455";
         src = fetchFromGitHub {
           owner = "zv";
@@ -98239,6 +102173,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "zeal-at-point";
+        ename = "zeal-at-point";
         version = "20180131.1554";
         src = fetchFromGitHub {
           owner = "jinzhu";
@@ -98265,6 +102200,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "zel";
+        ename = "zel";
         version = "20171014.132";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -98289,6 +102225,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "zen-and-art-theme";
+        ename = "zen-and-art-theme";
         version = "20120622.737";
         src = fetchFromGitHub {
           owner = "developernotes";
@@ -98313,6 +102250,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "zenburn-theme";
+        ename = "zenburn-theme";
         version = "20180531.902";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -98337,6 +102275,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "zencoding-mode";
+        ename = "zencoding-mode";
         version = "20140213.22";
         src = fetchFromGitHub {
           owner = "rooney";
@@ -98362,6 +102301,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "zenity-color-picker";
+        ename = "zenity-color-picker";
         version = "20160302.354";
         src = fetchgit {
           url = "https://bitbucket.org/Soft/zenity-color-picker.el";
@@ -98388,6 +102328,7 @@
                                , pkg-info }:
       melpaBuild {
         pname = "zephir-mode";
+        ename = "zephir-mode";
         version = "20170917.2125";
         src = fetchFromGitHub {
           owner = "sergeyklay";
@@ -98415,6 +102356,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "zerodark-theme";
+        ename = "zerodark-theme";
         version = "20180528.26";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -98440,6 +102382,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "zig-mode";
+        ename = "zig-mode";
         version = "20180309.1458";
         src = fetchFromGitHub {
           owner = "zig-lang";
@@ -98464,6 +102407,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "zlc";
+        ename = "zlc";
         version = "20151010.1857";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -98489,6 +102433,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "znc";
+        ename = "znc";
         version = "20160627.1332";
         src = fetchFromGitHub {
           owner = "sshirokov";
@@ -98513,6 +102458,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "zombie";
+        ename = "zombie";
         version = "20141222.816";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -98540,6 +102486,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "zombie-trellys-mode";
+        ename = "zombie-trellys-mode";
         version = "20150304.648";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -98565,6 +102512,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "zone-nyan";
+        ename = "zone-nyan";
         version = "20170818.944";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -98590,6 +102538,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "zone-rainbow";
+        ename = "zone-rainbow";
         version = "20160120.534";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -98616,6 +102565,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zone-select";
+        ename = "zone-select";
         version = "20160118.619";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -98641,6 +102591,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "zone-sl";
+        ename = "zone-sl";
         version = "20160201.410";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -98666,6 +102617,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "zoom";
+        ename = "zoom";
         version = "20180310.421";
         src = fetchFromGitHub {
           owner = "cyrus-and";
@@ -98691,6 +102643,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zoom-window";
+        ename = "zoom-window";
         version = "20170302.27";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -98716,6 +102669,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zop-to-char";
+        ename = "zop-to-char";
         version = "20160212.754";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -98741,6 +102695,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "zossima";
+        ename = "zossima";
         version = "20121123.1635";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -98766,6 +102721,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "zotelo";
+        ename = "zotelo";
         version = "20160602.249";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -98791,6 +102747,7 @@
                          , request-deferred }:
       melpaBuild {
         pname = "zotxt";
+        ename = "zotxt";
         version = "20180517.1847";
         src = fetchFromGitLab {
           owner = "egh";
@@ -98815,6 +102772,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "zoutline";
+        ename = "zoutline";
         version = "20180314.1059";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -98843,6 +102801,7 @@
                             , request }:
       melpaBuild {
         pname = "zpresent";
+        ename = "zpresent";
         version = "20180604.2138";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
@@ -98867,6 +102826,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "ztree";
+        ename = "ztree";
         version = "20180512.1150";
         src = fetchFromGitHub {
           owner = "fourier";
@@ -98891,6 +102851,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "zweilight-theme";
+        ename = "zweilight-theme";
         version = "20170112.2205";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
@@ -98915,6 +102876,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "zygospore";
+        ename = "zygospore";
         version = "20140703.152";
         src = fetchFromGitHub {
           owner = "LouisKottmann";
@@ -98942,6 +102904,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zzz-to-char";
+        ename = "zzz-to-char";
         version = "20171231.2219";
         src = fetchFromGitHub {
           owner = "mrkkrp";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index e8e69dcfbb3..56b17a865df 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -75,28 +75,16 @@ self:
       # upstream issue: missing file header
       elmine = markBroken super.elmine;
 
-      # upstream issue: missing dependency redshank
-      emr = markBroken super.emr;
-
       ess-R-data-view = super.ess-R-data-view.override {
         inherit (self.melpaPackages) ess ctable popup;
       };
 
-      # upstream issue: missing dependency highlight
-      evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
-      # upstream issue: missing dependency highlight
-      floobits  = markBroken super.floobits;
-
       # missing OCaml
       flycheck-ocaml = markBroken super.flycheck-ocaml;
 
       # Expects bash to be at /bin/bash
       flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing dependency
-      fold-dwim-org = markBroken super.fold-dwim-org;
-
       # build timeout
       graphene = markBroken super.graphene;
 
@@ -106,6 +94,14 @@ self:
       # Expects bash to be at /bin/bash
       helm-rtags = markBroken super.helm-rtags;
 
+      # Build same version as Haskell package
+      hindent = super.hindent.overrideAttrs (attrs: {
+        version = external.hindent.version;
+        src = external.hindent.src;
+        packageRequires = [ self.haskell-mode ];
+        propagatedUserEnvPkgs = [ external.hindent ];
+      });
+
       # upstream issue: missing file header
       ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 
@@ -158,9 +154,6 @@ self:
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
          }));
 
-      # upstream issue: missing dependency
-      org-readme = markBroken super.org-readme;
-
       # upstream issue: truncated file
       powershell = markBroken super.powershell;
 
@@ -173,9 +166,6 @@ self:
       # upstream issue: missing file footer
       seoul256-theme = markBroken super.seoul256-theme;
 
-      # upstream issue: missing dependency highlight
-      sonic-pi  = markBroken super.sonic-pi;
-
       spaceline = super.spaceline.override {
         inherit (self.melpaPackages) powerline;
       };
@@ -198,9 +188,6 @@ self:
       # upstream issue: missing file header
       voca-builder = markBroken super.voca-builder;
 
-      # upstream issue: missing dependency
-      weechat-alert = markBroken super.weechat-alert;
-
       # upstream issue: missing file header
       window-numbering = markBroken super.window-numbering;
 
@@ -216,6 +203,10 @@ self:
       });
     };
 
-    melpaPackages = super // overrides;
+    melpaPackages =
+      removeAttrs (super // overrides)
+      [
+        "show-marks"  # missing dependency: fm
+      ];
   in
     melpaPackages // { inherit melpaPackages; }
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 6e2a71c4311..df0ec7fcb12 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -6,6 +6,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "_0blayout";
+        ename = "0blayout";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "etu";
@@ -31,6 +32,7 @@
                      , melpaBuild }:
       melpaBuild {
         pname = "a";
+        ename = "a";
         version = "0.1.0.-3.4";
         src = fetchFromGitHub {
           owner = "plexus";
@@ -57,6 +59,7 @@
                                 , navi2ch }:
       melpaBuild {
         pname = "aa-edit-mode";
+        ename = "aa-edit-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -81,6 +84,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "abc-mode";
+        ename = "abc-mode";
         version = "20140225.944";
         src = fetchFromGitHub {
           owner = "mkjunker";
@@ -106,6 +110,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "abyss-theme";
+        ename = "abyss-theme";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "mgrbyte";
@@ -133,6 +138,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ac-alchemist";
+        ename = "ac-alchemist";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -159,6 +165,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ac-capf";
+        ename = "ac-capf";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -186,6 +193,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-cider";
+        ename = "ac-cider";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -215,6 +223,7 @@
                             , yasnippet }:
       melpaBuild {
         pname = "ac-clang";
+        ename = "ac-clang";
         version = "2.1.3";
         src = fetchFromGitHub {
           owner = "yaruopooner";
@@ -241,6 +250,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ac-dcd";
+        ename = "ac-dcd";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -267,6 +277,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ac-emacs-eclim";
+        ename = "ac-emacs-eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -293,6 +304,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-emoji";
+        ename = "ac-emoji";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -318,6 +330,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ac-etags";
+        ename = "ac-etags";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -344,6 +357,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-geiser";
+        ename = "ac-geiser";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "xiaohanyu";
@@ -370,6 +384,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ac-haskell-process";
+        ename = "ac-haskell-process";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -397,6 +412,7 @@
                            , popup }:
       melpaBuild {
         pname = "ac-helm";
+        ename = "ac-helm";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -423,6 +439,7 @@
                            , web-completion-data }:
       melpaBuild {
         pname = "ac-html";
+        ename = "ac-html";
         version = "0.31";
         src = fetchFromGitHub {
           owner = "cheunghy";
@@ -448,6 +465,7 @@
                                      , web-completion-data }:
       melpaBuild {
         pname = "ac-html-bootstrap";
+        ename = "ac-html-bootstrap";
         version = "0.9.3";
         src = fetchFromGitHub {
           owner = "osv";
@@ -473,6 +491,7 @@
                                       , web-completion-data }:
       melpaBuild {
         pname = "ac-html-csswatcher";
+        ename = "ac-html-csswatcher";
         version = "0.1.7";
         src = fetchFromGitHub {
           owner = "osv";
@@ -499,6 +518,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ac-inf-ruby";
+        ename = "ac-inf-ruby";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -525,6 +545,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-ispell";
+        ename = "ac-ispell";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -552,6 +573,7 @@
                            , mozc }:
       melpaBuild {
         pname = "ac-mozc";
+        ename = "ac-mozc";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "igjit";
@@ -577,6 +599,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ac-octave";
+        ename = "ac-octave";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -604,6 +627,7 @@
                           , yasnippet }:
       melpaBuild {
         pname = "ac-php";
+        ename = "ac-php";
         version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -635,6 +659,7 @@
                                , xcscope }:
       melpaBuild {
         pname = "ac-php-core";
+        ename = "ac-php-core";
         version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -662,6 +687,7 @@
                             , racer }:
       melpaBuild {
         pname = "ac-racer";
+        ename = "ac-racer";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -688,6 +714,7 @@
                             , rtags }:
       melpaBuild {
         pname = "ac-rtags";
+        ename = "ac-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -715,6 +742,7 @@
                             , slime }:
       melpaBuild {
         pname = "ac-slime";
+        ename = "ac-slime";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -740,6 +768,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ace-flyspell";
+        ename = "ace-flyspell";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -768,6 +797,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ace-isearch";
+        ename = "ace-isearch";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "tam17aki";
@@ -794,6 +824,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-buffer";
+        ename = "ace-jump-buffer";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -820,6 +851,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-helm-line";
+        ename = "ace-jump-helm-line";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -844,6 +876,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-mode";
+        ename = "ace-jump-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "winterTTr";
@@ -870,6 +903,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ace-jump-zap";
+        ename = "ace-jump-zap";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -895,6 +929,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ace-link";
+        ename = "ace-link";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -922,6 +957,7 @@
                               , pinyinlib }:
       melpaBuild {
         pname = "ace-pinyin";
+        ename = "ace-pinyin";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -948,6 +984,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ace-popup-menu";
+        ename = "ace-popup-menu";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -973,6 +1010,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ace-window";
+        ename = "ace-window";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -1004,7 +1042,7 @@
           rev = "37e9979eb65e3803fc00829377397b4e6f2bd059";
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ff331ed45e5b7697e4862e723408602ecc98bc7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
@@ -1021,6 +1059,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "actionscript-mode";
+        ename = "actionscript-mode";
         version = "7.2.2";
         src = fetchFromGitHub {
           owner = "austinhaas";
@@ -1046,6 +1085,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "adafruit-wisdom";
+        ename = "adafruit-wisdom";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -1070,6 +1110,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "add-hooks";
+        ename = "add-hooks";
         version = "3.1.1";
         src = fetchFromGitHub {
           owner = "nickmccurdy";
@@ -1094,6 +1135,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "add-node-modules-path";
+        ename = "add-node-modules-path";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -1119,6 +1161,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "addressbook-bookmark";
+        ename = "addressbook-bookmark";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -1144,6 +1187,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "adoc-mode";
+        ename = "adoc-mode";
         version = "0.6.6";
         src = fetchFromGitHub {
           owner = "sensorflo";
@@ -1168,6 +1212,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "aes";
+        ename = "aes";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "Sauermann";
@@ -1195,6 +1240,7 @@
                       , s }:
       melpaBuild {
         pname = "ag";
+        ename = "ag";
         version = "0.47";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -1221,6 +1267,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "aggressive-indent";
+        ename = "aggressive-indent";
         version = "1.9.0";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -1246,6 +1293,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ahk-mode";
+        ename = "ahk-mode";
         version = "1.5.6";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -1271,6 +1319,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ahungry-theme";
+        ename = "ahungry-theme";
         version = "1.10.0";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -1296,6 +1345,7 @@
                                   , powerline }:
       melpaBuild {
         pname = "airline-themes";
+        ename = "airline-themes";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
@@ -1322,6 +1372,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "alan-mode";
+        ename = "alan-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "M-industries";
@@ -1351,6 +1402,7 @@
                              , pkg-info }:
       melpaBuild {
         pname = "alchemist";
+        ename = "alchemist";
         version = "1.8.2";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -1376,6 +1428,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "alda-mode";
+        ename = "alda-mode";
         version = "0.2.0";
         src = fetchFromGitLab {
           owner = "jgkamat";
@@ -1401,6 +1454,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "alect-themes";
+        ename = "alect-themes";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -1427,6 +1481,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "alert";
+        ename = "alert";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -1453,6 +1508,7 @@
                                  , memoize }:
       melpaBuild {
         pname = "all-the-icons";
+        ename = "all-the-icons";
         version = "3.2.0";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -1480,6 +1536,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "all-the-icons-ivy";
+        ename = "all-the-icons-ivy";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "asok";
@@ -1512,6 +1569,7 @@
                             , seq }:
       melpaBuild {
         pname = "amd-mode";
+        ename = "amd-mode";
         version = "2.8";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -1547,6 +1605,7 @@
                        , s }:
       melpaBuild {
         pname = "amx";
+        ename = "amx";
         version = "3.2";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -1576,6 +1635,7 @@
                                  , s }:
       melpaBuild {
         pname = "anaconda-mode";
+        ename = "anaconda-mode";
         version = "0.1.12";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -1600,6 +1660,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "anaphora";
+        ename = "anaphora";
         version = "1.0.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -1624,6 +1685,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "android-mode";
+        ename = "android-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "remvee";
@@ -1648,6 +1710,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "angular-mode";
+        ename = "angular-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -1674,6 +1737,7 @@
                                     , s }:
       melpaBuild {
         pname = "angular-snippets";
+        ename = "angular-snippets";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -1698,6 +1762,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "annotate";
+        ename = "annotate";
         version = "0.4.7";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -1722,6 +1787,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "annoying-arrows-mode";
+        ename = "annoying-arrows-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -1748,6 +1814,7 @@
                         , s }:
       melpaBuild {
         pname = "ansi";
+        ename = "ansi";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -1774,6 +1841,7 @@
                            , s }:
       melpaBuild {
         pname = "ansible";
+        ename = "ansible";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -1799,6 +1867,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ansible-doc";
+        ename = "ansible-doc";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -1824,6 +1893,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ansible-vault";
+        ename = "ansible-vault";
         version = "0.3.4";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -1848,6 +1918,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "anti-zenburn-theme";
+        ename = "anti-zenburn-theme";
         version = "2.5.1";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -1872,6 +1943,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "anyins";
+        ename = "anyins";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "antham";
@@ -1898,6 +1970,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "anzu";
+        ename = "anzu";
         version = "0.62";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -1922,6 +1995,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "apache-mode";
+        ename = "apache-mode";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -1947,6 +2021,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "apib-mode";
+        ename = "apib-mode";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "w-vi";
@@ -1972,6 +2047,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "apiwrap";
+        ename = "apiwrap";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -1996,6 +2072,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "apples-mode";
+        ename = "apples-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "tequilasunset";
@@ -2020,6 +2097,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "aproject";
+        ename = "aproject";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "vietor";
@@ -2044,6 +2122,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "apropospriate-theme";
+        ename = "apropospriate-theme";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -2068,6 +2147,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "artbollocks-mode";
+        ename = "artbollocks-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "sachac";
@@ -2092,6 +2172,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "arview";
+        ename = "arview";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "afainer";
@@ -2118,6 +2199,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "asilea";
+        ename = "asilea";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -2144,6 +2226,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "assess";
+        ename = "assess";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -2168,6 +2251,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "async";
+        ename = "async";
         version = "1.9.3";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -2192,6 +2276,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "atom-one-dark-theme";
+        ename = "atom-one-dark-theme";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "jonathanchu";
@@ -2219,6 +2304,7 @@
                                  , websocket }:
       melpaBuild {
         pname = "atomic-chrome";
+        ename = "atomic-chrome";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -2244,6 +2330,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "auctex-latexmk";
+        ename = "auctex-latexmk";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -2271,6 +2358,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "aurel";
+        ename = "aurel";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -2295,6 +2383,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "aurora-config-mode";
+        ename = "aurora-config-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "bdd";
@@ -2320,6 +2409,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "auth-source-pass";
+        ename = "auth-source-pass";
         version = "4.0.1";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -2346,6 +2436,7 @@
                                 , packed }:
       melpaBuild {
         pname = "auto-compile";
+        ename = "auto-compile";
         version = "1.4.3";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -2372,6 +2463,7 @@
                                  , popup }:
       melpaBuild {
         pname = "auto-complete";
+        ename = "auto-complete";
         version = "1.5.1";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -2396,6 +2488,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-clang-async";
+        ename = "auto-complete-clang-async";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "Golevka";
@@ -2421,6 +2514,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-exuberant-ctags";
+        ename = "auto-complete-exuberant-ctags";
         version = "0.0.7";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -2446,6 +2540,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "auto-complete-nxml";
+        ename = "auto-complete-nxml";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -2473,6 +2568,7 @@
                                       , yaxception }:
       melpaBuild {
         pname = "auto-complete-pcmp";
+        ename = "auto-complete-pcmp";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -2499,6 +2595,7 @@
                                       , sage-shell-mode }:
       melpaBuild {
         pname = "auto-complete-sage";
+        ename = "auto-complete-sage";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -2523,6 +2620,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "auto-dictionary";
+        ename = "auto-dictionary";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -2547,6 +2645,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "auto-indent-mode";
+        ename = "auto-indent-mode";
         version = "0.126";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -2572,6 +2671,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "auto-minor-mode";
+        ename = "auto-minor-mode";
         version = "20180527.1";
         src = fetchFromGitHub {
           owner = "joewreschnig";
@@ -2598,6 +2698,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "auto-package-update";
+        ename = "auto-package-update";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "rranelli";
@@ -2624,6 +2725,7 @@
                                       , popwin }:
       melpaBuild {
         pname = "auto-shell-command";
+        ename = "auto-shell-command";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -2649,6 +2751,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "auto-yasnippet";
+        ename = "auto-yasnippet";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -2673,6 +2776,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "autodisass-java-bytecode";
+        ename = "autodisass-java-bytecode";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "gbalats";
@@ -2697,6 +2801,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "autodisass-llvm-bitcode";
+        ename = "autodisass-llvm-bitcode";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "gbalats";
@@ -2722,6 +2827,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "autopair";
+        ename = "autopair";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -2749,6 +2855,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "autothemer";
+        ename = "autothemer";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "sebastiansturm";
@@ -2775,6 +2882,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "avy";
+        ename = "avy";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -2801,6 +2909,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "avy-menu";
+        ename = "avy-menu";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -2828,6 +2937,7 @@
                               , migemo }:
       melpaBuild {
         pname = "avy-migemo";
+        ename = "avy-migemo";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -2853,6 +2963,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "avy-zap";
+        ename = "avy-zap";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -2877,6 +2988,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "babel";
+        ename = "babel";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -2906,6 +3018,7 @@
                                , ucs-utils }:
       melpaBuild {
         pname = "back-button";
+        ename = "back-button";
         version = "0.6.6";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -2937,6 +3050,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "badwolf-theme";
+        ename = "badwolf-theme";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "bkruczyk";
@@ -2962,6 +3076,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "banner-comment";
+        ename = "banner-comment";
         version = "2.6.2";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
@@ -2986,6 +3101,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "base16-theme";
+        ename = "base16-theme";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "belak";
@@ -3010,6 +3126,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "bash-completion";
+        ename = "bash-completion";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "szermatt";
@@ -3035,6 +3152,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bazel-mode";
+        ename = "bazel-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -3059,6 +3177,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "bbcode-mode";
+        ename = "bbcode-mode";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "lassik";
@@ -3086,6 +3205,7 @@
                          , yaxception }:
       melpaBuild {
         pname = "bbdb-";
+        ename = "bbdb-";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -3110,6 +3230,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "bbdb-vcard";
+        ename = "bbdb-vcard";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "tohojo";
@@ -3135,6 +3256,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bbdb2erc";
+        ename = "bbdb2erc";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -3160,6 +3282,7 @@
                           , seq }:
       melpaBuild {
         pname = "beacon";
+        ename = "beacon";
         version = "1.3.4";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -3185,6 +3308,7 @@
                              , org }:
       melpaBuild {
         pname = "beeminder";
+        ename = "beeminder";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "Sodaware";
@@ -3210,6 +3334,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "beginend";
+        ename = "beginend";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -3234,6 +3359,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "benchmark-init";
+        ename = "benchmark-init";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "dholm";
@@ -3258,6 +3384,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "benchstat";
+        ename = "benchstat";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Quasilyte";
@@ -3282,6 +3409,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "better-defaults";
+        ename = "better-defaults";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -3307,6 +3435,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "better-shell";
+        ename = "better-shell";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "killdash9";
@@ -3333,6 +3462,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "biblio";
+        ename = "biblio";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -3361,6 +3491,7 @@
                                , seq }:
       melpaBuild {
         pname = "biblio-core";
+        ename = "biblio-core";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -3386,6 +3517,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bicycle";
+        ename = "bicycle";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -3411,6 +3543,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bifocal";
+        ename = "bifocal";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "riscy";
@@ -3436,6 +3569,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "binclock";
+        ename = "binclock";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "davep";
@@ -3460,6 +3594,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bind-key";
+        ename = "bind-key";
         version = "2.3";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -3485,6 +3620,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "bind-map";
+        ename = "bind-map";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "justbur";
@@ -3509,6 +3645,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bing-dict";
+        ename = "bing-dict";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -3533,6 +3670,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "birds-of-paradise-plus-theme";
+        ename = "birds-of-paradise-plus-theme";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -3557,6 +3695,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "bm";
+        ename = "bm";
         version = "201807";
         src = fetchFromGitHub {
           owner = "joodland";
@@ -3582,6 +3721,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "bnfc";
+        ename = "bnfc";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "jmitchell";
@@ -3607,6 +3747,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bog";
+        ename = "bog";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "kyleam";
@@ -3631,6 +3772,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "bongo";
+        ename = "bongo";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "dbrock";
@@ -3656,6 +3798,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "bool-flip";
+        ename = "bool-flip";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "michaeljb";
@@ -3684,6 +3827,7 @@
                         , multiple-cursors }:
       melpaBuild {
         pname = "boon";
+        ename = "boon";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -3708,6 +3852,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "borg";
+        ename = "borg";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -3733,6 +3878,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "boxquote";
+        ename = "boxquote";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "davep";
@@ -3760,6 +3906,7 @@
                                     , s }:
       melpaBuild {
         pname = "browse-at-remote";
+        ename = "browse-at-remote";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "rmuslimov";
@@ -3784,6 +3931,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "browse-kill-ring";
+        ename = "browse-kill-ring";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "browse-kill-ring";
@@ -3809,6 +3957,7 @@
                                    , string-utils }:
       melpaBuild {
         pname = "browse-url-dwim";
+        ename = "browse-url-dwim";
         version = "0.6.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -3835,6 +3984,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "bshell";
+        ename = "bshell";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -3859,6 +4009,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buffer-flip";
+        ename = "buffer-flip";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "killdash9";
@@ -3886,6 +4037,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "buffer-manage";
+        ename = "buffer-manage";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -3910,6 +4062,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "buffer-move";
+        ename = "buffer-move";
         version = "0.6.2";
         src = fetchFromGitHub {
           owner = "lukhas";
@@ -3934,6 +4087,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "buffer-utils";
+        ename = "buffer-utils";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -3959,6 +4113,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "buffer-watcher";
+        ename = "buffer-watcher";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -3983,6 +4138,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bufshow";
+        ename = "bufshow";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -4007,6 +4163,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "bug-reference-github";
+        ename = "bug-reference-github";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -4033,6 +4190,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "bui";
+        ename = "bui";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -4058,6 +4216,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "build-status";
+        ename = "build-status";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -4083,6 +4242,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "bundler";
+        ename = "bundler";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "tobiassvn";
@@ -4107,6 +4267,7 @@
                                                , melpaBuild }:
       melpaBuild {
         pname = "bury-successful-compilation";
+        ename = "bury-successful-compilation";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -4134,6 +4295,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "butler";
+        ename = "butler";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "AshtonKem";
@@ -4158,6 +4320,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "buttercup";
+        ename = "buttercup";
         version = "1.12";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -4182,6 +4345,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "button-lock";
+        ename = "button-lock";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -4207,6 +4371,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "cacoo";
+        ename = "cacoo";
         version = "2.1.2";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4232,6 +4397,7 @@
                                   , s }:
       melpaBuild {
         pname = "cake-inflector";
+        ename = "cake-inflector";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -4256,6 +4422,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "calendar-norway";
+        ename = "calendar-norway";
         version = "0.9.3";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -4280,6 +4447,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "calfw";
+        ename = "calfw";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4304,6 +4472,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "calfw-cal";
+        ename = "calfw-cal";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4328,6 +4497,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "calfw-howm";
+        ename = "calfw-howm";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4352,6 +4522,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "calfw-ical";
+        ename = "calfw-ical";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4376,6 +4547,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "calfw-org";
+        ename = "calfw-org";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -4405,6 +4577,7 @@
                               , tree-mode }:
       melpaBuild {
         pname = "call-graph";
+        ename = "call-graph";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "beacoder";
@@ -4432,6 +4605,7 @@
                              , names }:
       melpaBuild {
         pname = "camcorder";
+        ename = "camcorder";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -4456,6 +4630,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "caml";
+        ename = "caml";
         version = "4.7.0";
         src = fetchFromGitHub {
           owner = "ocaml";
@@ -4482,6 +4657,7 @@
                          , rust-mode }:
       melpaBuild {
         pname = "cargo";
+        ename = "cargo";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "kwrooijen";
@@ -4510,6 +4686,7 @@
                               , s }:
       melpaBuild {
         pname = "caseformat";
+        ename = "caseformat";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -4541,6 +4718,7 @@
                         , shut-up }:
       melpaBuild {
         pname = "cask";
+        ename = "cask";
         version = "0.8.4";
         src = fetchFromGitHub {
           owner = "cask";
@@ -4566,6 +4744,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cask-mode";
+        ename = "cask-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -4598,6 +4777,7 @@
                                         , shut-up }:
       melpaBuild {
         pname = "cask-package-toolset";
+        ename = "cask-package-toolset";
         version = "0.9.2";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -4624,6 +4804,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "caskxy";
+        ename = "caskxy";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -4648,6 +4829,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "catmacs";
+        ename = "catmacs";
         version = "0.1.1";
         src = fetchgit {
           url = "https://bitbucket.org/pymaximus/catmacs";
@@ -4672,6 +4854,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "cbm";
+        ename = "cbm";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "akermu";
@@ -4696,6 +4879,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cdlatex";
+        ename = "cdlatex";
         version = "4.7";
         src = fetchFromGitHub {
           owner = "cdominik";
@@ -4724,6 +4908,7 @@
                          , pkg-info }:
       melpaBuild {
         pname = "cdnjs";
+        ename = "cdnjs";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -4752,6 +4937,7 @@
                           , s }:
       melpaBuild {
         pname = "celery";
+        ename = "celery";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -4780,6 +4966,7 @@
                            , s }:
       melpaBuild {
         pname = "cerbere";
+        ename = "cerbere";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -4805,6 +4992,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ceylon-mode";
+        ename = "ceylon-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
@@ -4829,6 +5017,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "cfengine-code-style";
+        ename = "cfengine-code-style";
         version = "3.12.0";
         src = fetchFromGitHub {
           owner = "cfengine";
@@ -4856,6 +5045,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "cframe";
+        ename = "cframe";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -4880,6 +5070,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "chapel-mode";
+        ename = "chapel-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "russel";
@@ -4906,6 +5097,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "char-menu";
+        ename = "char-menu";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -4930,6 +5122,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "charmap";
+        ename = "charmap";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "lateau";
@@ -4954,6 +5147,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "chatwork";
+        ename = "chatwork";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "ataka";
@@ -4979,6 +5173,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cheat-sh";
+        ename = "cheat-sh";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "davep";
@@ -5005,6 +5200,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "checkbox";
+        ename = "checkbox";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "camdez";
@@ -5032,6 +5228,7 @@
                         , s }:
       melpaBuild {
         pname = "chee";
+        ename = "chee";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "eikek";
@@ -5057,6 +5254,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "chinese-word-at-point";
+        ename = "chinese-word-at-point";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -5083,6 +5281,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "choice-program";
+        ename = "choice-program";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -5113,6 +5312,7 @@
                          , spinner }:
       melpaBuild {
         pname = "cider";
+        ename = "cider";
         version = "0.17.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5140,6 +5340,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "cider-eval-sexp-fu";
+        ename = "cider-eval-sexp-fu";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5164,6 +5365,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cil-mode";
+        ename = "cil-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "ForNeVeR";
@@ -5189,6 +5391,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "circadian";
+        ename = "circadian";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "GuidoSchmidt";
@@ -5214,6 +5417,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "circe";
+        ename = "circe";
         version = "2.10";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -5241,6 +5445,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "circe-notifications";
+        ename = "circe-notifications";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "eqyiel";
@@ -5271,6 +5476,7 @@
                             , string-inflection }:
       melpaBuild {
         pname = "citeproc";
+        ename = "citeproc";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "andras-simonyi";
@@ -5295,6 +5501,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cl-format";
+        ename = "cl-format";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "alvinfrancis";
@@ -5320,6 +5527,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "cl-lib-highlight";
+        ename = "cl-lib-highlight";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -5345,6 +5553,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "click-mode";
+        ename = "click-mode";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "bmalehorn";
@@ -5371,6 +5580,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cliphist";
+        ename = "cliphist";
         version = "0.5.5";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -5395,6 +5605,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "clips-mode";
+        ename = "clips-mode";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "grettke";
@@ -5430,6 +5641,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "clj-refactor";
+        ename = "clj-refactor";
         version = "2.3.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5469,6 +5681,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cljr-helm";
+        ename = "cljr-helm";
         version = "0.11";
         src = fetchFromGitHub {
           owner = "philjackson";
@@ -5495,6 +5708,7 @@
                            , projectile }:
       melpaBuild {
         pname = "clocker";
+        ename = "clocker";
         version = "0.0.11";
         src = fetchFromGitHub {
           owner = "roman";
@@ -5521,6 +5735,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "clojure-cheatsheet";
+        ename = "clojure-cheatsheet";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5546,6 +5761,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "clojure-mode";
+        ename = "clojure-mode";
         version = "5.8.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5571,6 +5787,7 @@
                                                    , melpaBuild }:
       melpaBuild {
         pname = "clojure-mode-extra-font-locking";
+        ename = "clojure-mode-extra-font-locking";
         version = "5.8.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -5597,6 +5814,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "clojure-quick-repls";
+        ename = "clojure-quick-repls";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "symfrog";
@@ -5622,6 +5840,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "clojure-snippets";
+        ename = "clojure-snippets";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "mpenet";
@@ -5648,6 +5867,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "closql";
+        ename = "closql";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -5673,6 +5893,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "clues-theme";
+        ename = "clues-theme";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -5698,6 +5919,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cm-mode";
+        ename = "cm-mode";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -5726,6 +5948,7 @@
                              , seq }:
       melpaBuild {
         pname = "cmake-ide";
+        ename = "cmake-ide";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -5750,7 +5973,8 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "cmake-mode";
-        version = "3.12.0.-1.3";
+        ename = "cmake-mode";
+        version = "3.12.0";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
@@ -5774,6 +5998,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "cmake-project";
+        ename = "cmake-project";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "alamaison";
@@ -5799,6 +6024,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "cnfonts";
+        ename = "cnfonts";
         version = "0.9.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -5825,6 +6051,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "codic";
+        ename = "codic";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -5851,6 +6078,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "coffee-mode";
+        ename = "coffee-mode";
         version = "0.6.3";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -5877,6 +6105,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "color-identifiers-mode";
+        ename = "color-identifiers-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ankurdave";
@@ -5902,6 +6131,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "color-theme-modern";
+        ename = "color-theme-modern";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -5926,6 +6156,7 @@
                                                    , melpaBuild }:
       melpaBuild {
         pname = "color-theme-sanityinc-solarized";
+        ename = "color-theme-sanityinc-solarized";
         version = "2.29";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -5950,6 +6181,7 @@
                                                   , melpaBuild }:
       melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
+        ename = "color-theme-sanityinc-tomorrow";
         version = "1.17";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -5975,6 +6207,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "colormaps";
+        ename = "colormaps";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "lepisma";
@@ -6003,6 +6236,7 @@
                              , s }:
       melpaBuild {
         pname = "commander";
+        ename = "commander";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -6027,6 +6261,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "comment-dwim-2";
+        ename = "comment-dwim-2";
         version = "1.2.2";
         src = fetchFromGitHub {
           owner = "remyferre";
@@ -6053,6 +6288,7 @@
                                 , pkg-info }:
       melpaBuild {
         pname = "comment-tags";
+        ename = "comment-tags";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "vincekd";
@@ -6079,6 +6315,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "commenter";
+        ename = "commenter";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -6104,6 +6341,7 @@
                                         , yasnippet }:
       melpaBuild {
         pname = "common-lisp-snippets";
+        ename = "common-lisp-snippets";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -6129,6 +6367,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "company";
+        ename = "company";
         version = "0.9.6";
         src = fetchFromGitHub {
           owner = "company-mode";
@@ -6158,6 +6397,7 @@
                                     , s }:
       melpaBuild {
         pname = "company-anaconda";
+        ename = "company-anaconda";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -6184,6 +6424,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "company-ansible";
+        ename = "company-ansible";
         version = "0.7.1";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -6211,6 +6452,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-cabal";
+        ename = "company-cabal";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -6240,6 +6482,7 @@
                                , yasnippet }:
       melpaBuild {
         pname = "company-coq";
+        ename = "company-coq";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
@@ -6267,6 +6510,7 @@
                                 , parent-mode }:
       melpaBuild {
         pname = "company-dict";
+        ename = "company-dict";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -6295,6 +6539,7 @@
                                 , s }:
       melpaBuild {
         pname = "company-edbi";
+        ename = "company-edbi";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -6322,6 +6567,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "company-emacs-eclim";
+        ename = "company-emacs-eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -6348,6 +6594,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-emoji";
+        ename = "company-emoji";
         version = "2.5.0";
         src = fetchFromGitHub {
           owner = "dunn";
@@ -6375,6 +6622,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "company-erlang";
+        ename = "company-erlang";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -6403,6 +6651,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-ghc";
+        ename = "company-ghc";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -6429,6 +6678,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "company-go";
+        ename = "company-go";
         version = "20170907";
         src = fetchFromGitHub {
           owner = "nsf";
@@ -6457,6 +6707,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-irony";
+        ename = "company-irony";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -6484,6 +6735,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "company-irony-c-headers";
+        ename = "company-irony-c-headers";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "hotpxl";
@@ -6512,6 +6764,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-jedi";
+        ename = "company-jedi";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -6541,6 +6794,7 @@
                                , s }:
       melpaBuild {
         pname = "company-lsp";
+        ename = "company-lsp";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "tigersoldier";
@@ -6567,6 +6821,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "company-math";
+        ename = "company-math";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -6593,6 +6848,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-ngram";
+        ename = "company-ngram";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "kshramt";
@@ -6620,6 +6876,7 @@
                                          , nixos-options }:
       melpaBuild {
         pname = "company-nixos-options";
+        ename = "company-nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -6647,6 +6904,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "company-php";
+        ename = "company-php";
         version = "2.0.5";
         src = fetchFromGitHub {
           owner = "xcwen";
@@ -6674,6 +6932,7 @@
                                      , prescient }:
       melpaBuild {
         pname = "company-prescient";
+        ename = "company-prescient";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -6701,6 +6960,7 @@
                                      , pos-tip }:
       melpaBuild {
         pname = "company-quickhelp";
+        ename = "company-quickhelp";
         version = "2.3.0";
         src = fetchFromGitHub {
           owner = "expez";
@@ -6730,6 +6990,7 @@
                                       , restclient }:
       melpaBuild {
         pname = "company-restclient";
+        ename = "company-restclient";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -6763,6 +7024,7 @@
                                  , rtags }:
       melpaBuild {
         pname = "company-rtags";
+        ename = "company-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -6791,6 +7053,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "company-shell";
+        ename = "company-shell";
         version = "1.2.1";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -6820,6 +7083,7 @@
                                      , sourcekit }:
       melpaBuild {
         pname = "company-sourcekit";
+        ename = "company-sourcekit";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -6846,6 +7110,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "company-statistics";
+        ename = "company-statistics";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "company-mode";
@@ -6876,6 +7141,7 @@
                                 , tern }:
       melpaBuild {
         pname = "company-tern";
+        ename = "company-tern";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -6903,6 +7169,7 @@
                                      , terraform-mode }:
       melpaBuild {
         pname = "company-terraform";
+        ename = "company-terraform";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "rafalcieslak";
@@ -6931,6 +7198,7 @@
                                , web-completion-data }:
       melpaBuild {
         pname = "company-web";
+        ename = "company-web";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "osv";
@@ -6962,6 +7230,7 @@
                                 , ycmd }:
       melpaBuild {
         pname = "company-ycmd";
+        ename = "company-ycmd";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -6987,6 +7256,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "composable";
+        ename = "composable";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "paldepind";
@@ -7016,6 +7286,7 @@
                             , seq }:
       melpaBuild {
         pname = "composer";
+        ename = "composer";
         version = "0.0.8";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -7042,6 +7313,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "concurrent";
+        ename = "concurrent";
         version = "0.5.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -7071,6 +7343,7 @@
                          , s }:
       melpaBuild {
         pname = "conda";
+        ename = "conda";
         version = "0.0.9";
         src = fetchFromGitHub {
           owner = "necaris";
@@ -7095,6 +7368,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "conkeror-minor-mode";
+        ename = "conkeror-minor-mode";
         version = "1.6.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -7122,6 +7396,7 @@
                                , parsec }:
       melpaBuild {
         pname = "conllu-mode";
+        ename = "conllu-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "odanoburu";
@@ -7146,6 +7421,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "connection";
+        ename = "connection";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -7173,6 +7449,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "contextual";
+        ename = "contextual";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "lshift-de";
@@ -7197,6 +7474,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "contextual-menubar";
+        ename = "contextual-menubar";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -7222,6 +7500,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "copy-as-format";
+        ename = "copy-as-format";
         version = "0.0.7";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -7250,6 +7529,7 @@
                                      , s }:
       melpaBuild {
         pname = "copy-file-on-save";
+        ename = "copy-file-on-save";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -7276,6 +7556,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "copyit";
+        ename = "copyit";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -7303,6 +7584,7 @@
                                  , pandoc }:
       melpaBuild {
         pname = "copyit-pandoc";
+        ename = "copyit-pandoc";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -7327,6 +7609,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "corral";
+        ename = "corral";
         version = "0.3.20";
         src = fetchFromGitHub {
           owner = "nivekuil";
@@ -7353,6 +7636,7 @@
                            , swiper }:
       melpaBuild {
         pname = "counsel";
+        ename = "counsel";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -7379,6 +7663,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "counsel-bbdb";
+        ename = "counsel-bbdb";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -7408,6 +7693,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "counsel-dash";
+        ename = "counsel-dash";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -7434,6 +7720,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-etags";
+        ename = "counsel-etags";
         version = "1.6.2";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -7460,6 +7747,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-gtags";
+        ename = "counsel-gtags";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -7486,6 +7774,7 @@
                                       , projectile }:
       melpaBuild {
         pname = "counsel-projectile";
+        ename = "counsel-projectile";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "ericdanan";
@@ -7512,6 +7801,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "counsel-tramp";
+        ename = "counsel-tramp";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -7538,6 +7828,7 @@
                             , ov }:
       melpaBuild {
         pname = "coverage";
+        ename = "coverage";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "trezona-lecomte";
@@ -7564,6 +7855,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "coverlay";
+        ename = "coverlay";
         version = "3.0.1";
         src = fetchFromGitHub {
           owner = "twada";
@@ -7588,6 +7880,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "cpputils-cmake";
+        ename = "cpputils-cmake";
         version = "5.5";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -7613,6 +7906,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "creamsody-theme";
+        ename = "creamsody-theme";
         version = "0.3.7";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -7639,6 +7933,7 @@
                          , s }:
       melpaBuild {
         pname = "creds";
+        ename = "creds";
         version = "0.0.6.1";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -7667,6 +7962,7 @@
                             , s }:
       melpaBuild {
         pname = "cricbuzz";
+        ename = "cricbuzz";
         version = "0.3.5";
         src = fetchFromGitHub {
           owner = "lepisma";
@@ -7692,6 +7988,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "crm-custom";
+        ename = "crm-custom";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -7717,6 +8014,7 @@
                         , seq }:
       melpaBuild {
         pname = "crux";
+        ename = "crux";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -7741,6 +8039,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cryptol-mode";
+        ename = "cryptol-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "thoughtpolice";
@@ -7766,6 +8065,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "crystal-mode";
+        ename = "crystal-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
@@ -7790,6 +8090,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "csharp-mode";
+        ename = "csharp-mode";
         version = "0.9.2";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -7817,6 +8118,7 @@
                                , shut-up }:
       melpaBuild {
         pname = "csound-mode";
+        ename = "csound-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "hlolli";
@@ -7841,6 +8143,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "csv";
+        ename = "csv";
         version = "2.1";
         src = fetchFromGitLab {
           owner = "u11";
@@ -7865,6 +8168,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ctable";
+        ename = "ctable";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -7889,6 +8193,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ctags-update";
+        ename = "ctags-update";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -7916,6 +8221,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "ctxmenu";
+        ename = "ctxmenu";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -7942,6 +8248,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cubicaltt";
+        ename = "cubicaltt";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "mortberg";
@@ -7966,6 +8273,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "cubicle-mode";
+        ename = "cubicle-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "cubicle-model-checker";
@@ -7990,6 +8298,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "cuda-mode";
+        ename = "cuda-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "chachi";
@@ -8016,6 +8325,7 @@
                             , yaml-mode }:
       melpaBuild {
         pname = "cwl-mode";
+        ename = "cwl-mode";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -8040,6 +8350,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "cyberpunk-theme";
+        ename = "cyberpunk-theme";
         version = "1.21";
         src = fetchFromGitHub {
           owner = "n3mo";
@@ -8065,6 +8376,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "cyphejor";
+        ename = "cyphejor";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -8089,6 +8401,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "cython-mode";
+        ename = "cython-mode";
         version = "0.28.4";
         src = fetchFromGitHub {
           owner = "cython";
@@ -8113,6 +8426,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "d-mode";
+        ename = "d-mode";
         version = "2.0.9";
         src = fetchFromGitHub {
           owner = "Emacs-D-Mode-Maintainers";
@@ -8138,6 +8452,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dad-joke";
+        ename = "dad-joke";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "davep";
@@ -8163,6 +8478,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "daemons";
+        ename = "daemons";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "cbowdon";
@@ -8193,6 +8509,7 @@
                          , s }:
       melpaBuild {
         pname = "dante";
+        ename = "dante";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -8217,6 +8534,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "darcula-theme";
+        ename = "darcula-theme";
         version = "2.0";
         src = fetchFromGitLab {
           owner = "fommil";
@@ -8242,6 +8560,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "darktooth-theme";
+        ename = "darktooth-theme";
         version = "0.3.7";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -8271,6 +8590,7 @@
                              , s }:
       melpaBuild {
         pname = "dart-mode";
+        ename = "dart-mode";
         version = "1.0.3";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -8295,6 +8615,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "dash";
+        ename = "dash";
         version = "2.14.1";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -8321,6 +8642,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "dash-functional";
+        ename = "dash-functional";
         version = "2.14.1";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -8347,6 +8669,7 @@
                              , page-break-lines }:
       melpaBuild {
         pname = "dashboard";
+        ename = "dashboard";
         version = "1.2.4";
         src = fetchFromGitHub {
           owner = "rakanalh";
@@ -8371,6 +8694,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "date-at-point";
+        ename = "date-at-point";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -8398,6 +8722,7 @@
                               , yaxception }:
       melpaBuild {
         pname = "date-field";
+        ename = "date-field";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -8424,6 +8749,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "datetime";
+        ename = "datetime";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -8453,6 +8779,7 @@
                             , spinner }:
       melpaBuild {
         pname = "deadgrep";
+        ename = "deadgrep";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -8478,6 +8805,7 @@
                             , xml-rpc }:
       melpaBuild {
         pname = "debpaste";
+        ename = "debpaste";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -8502,6 +8830,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "decide";
+        ename = "decide";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "lifelike";
@@ -8526,6 +8855,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "dedicated";
+        ename = "dedicated";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -8550,6 +8880,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "default-text-scale";
+        ename = "default-text-scale";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -8575,6 +8906,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "deferred";
+        ename = "deferred";
         version = "0.5.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -8600,6 +8932,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "define-word";
+        ename = "define-word";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -8624,6 +8957,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "deft";
+        ename = "deft";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "jrblevin";
@@ -8650,6 +8984,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "demangle-mode";
+        ename = "demangle-mode";
         version = "1.2.2";
         src = fetchFromGitHub {
           owner = "liblit";
@@ -8675,6 +9010,7 @@
                                    , yabin }:
       melpaBuild {
         pname = "describe-number";
+        ename = "describe-number";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "netromdk";
@@ -8700,6 +9036,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "desktop-environment";
+        ename = "desktop-environment";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -8727,6 +9064,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "desktop-plus";
+        ename = "desktop+";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "ffevotte";
@@ -8751,6 +9089,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "desktop-registry";
+        ename = "desktop-registry";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -8776,6 +9115,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "diary-manager";
+        ename = "diary-manager";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -8800,6 +9140,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dictionary";
+        ename = "dictionary";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -8825,6 +9166,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "diff-hl";
+        ename = "diff-hl";
         version = "1.8.4";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -8853,6 +9195,7 @@
                            , s }:
       melpaBuild {
         pname = "difflib";
+        ename = "difflib";
         version = "0.3.8";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -8877,6 +9220,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diffview";
+        ename = "diffview";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "mgalgs";
@@ -8901,6 +9245,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "digistar-mode";
+        ename = "digistar-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "retroj";
@@ -8926,6 +9271,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "dim";
+        ename = "dim";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -8950,6 +9296,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dim-autoload";
+        ename = "dim-autoload";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -8974,6 +9321,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diminish";
+        ename = "diminish";
         version = "0.45";
         src = fetchFromGitHub {
           owner = "myrjola";
@@ -8999,6 +9347,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "dimmer";
+        ename = "dimmer";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -9029,6 +9378,7 @@
                             , s }:
       melpaBuild {
         pname = "dionysos";
+        ename = "dionysos";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -9054,6 +9404,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dired-atool";
+        ename = "dired-atool";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -9078,6 +9429,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-efap";
+        ename = "dired-efap";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "juan-leon";
@@ -9103,6 +9455,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "dired-explorer";
+        ename = "dired-explorer";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "jidaikobo-shibata";
@@ -9127,6 +9480,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dired-fdclone";
+        ename = "dired-fdclone";
         version = "1.5.4";
         src = fetchFromGitHub {
           owner = "knu";
@@ -9152,6 +9506,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "dired-hide-dotfiles";
+        ename = "dired-hide-dotfiles";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "mattiasb";
@@ -9177,6 +9532,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "dired-icon";
+        ename = "dired-icon";
         version = "0.5";
         src = fetchFromGitLab {
           owner = "xuhdev";
@@ -9201,6 +9557,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dired-imenu";
+        ename = "dired-imenu";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -9226,6 +9583,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "dired-k";
+        ename = "dired-k";
         version = "0.19";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -9251,6 +9609,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "dired-quick-sort";
+        ename = "dired-quick-sort";
         version = "0.1";
         src = fetchFromGitLab {
           owner = "xuhdev";
@@ -9278,6 +9637,7 @@
                                , s }:
       melpaBuild {
         pname = "dired-rsync";
+        ename = "dired-rsync";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -9302,6 +9662,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "dired-single";
+        ename = "dired-single";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "crocket";
@@ -9326,6 +9687,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "dired-toggle-sudo";
+        ename = "dired-toggle-sudo";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "renard";
@@ -9351,6 +9713,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "diredfl";
+        ename = "diredfl";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -9375,6 +9738,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "diredful";
+        ename = "diredful";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "thamer";
@@ -9402,6 +9766,7 @@
                           , with-editor }:
       melpaBuild {
         pname = "direnv";
+        ename = "direnv";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -9426,6 +9791,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "direx";
+        ename = "direx";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -9451,6 +9817,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "direx-grep";
+        ename = "direx-grep";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -9475,6 +9842,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "disable-mouse";
+        ename = "disable-mouse";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -9500,6 +9868,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "discover";
+        ename = "discover";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -9525,6 +9894,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "discover-my-major";
+        ename = "discover-my-major";
         version = "1.0";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/discover-my-major.git";
@@ -9548,6 +9918,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "dispass";
+        ename = "dispass";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -9578,7 +9949,7 @@
           rev = "beac4c1f3b7e";
           sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode";
           sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd";
           name = "ditz-mode";
@@ -9596,6 +9967,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "dix";
+        ename = "dix";
         version = "0.3.5";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -9622,6 +9994,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "dix-evil";
+        ename = "dix-evil";
         version = "0.3.5";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -9653,6 +10026,7 @@
                           , tablist }:
       melpaBuild {
         pname = "docker";
+        ename = "docker";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -9688,6 +10062,7 @@
                                        , yaml-mode }:
       melpaBuild {
         pname = "docker-compose-mode";
+        ename = "docker-compose-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "meqif";
@@ -9714,6 +10089,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "docker-tramp";
+        ename = "docker-tramp";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "emacs-pe";
@@ -9738,6 +10114,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "dockerfile-mode";
+        ename = "dockerfile-mode";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "spotify";
@@ -9762,6 +10139,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dokuwiki-mode";
+        ename = "dokuwiki-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "kai2nenobu";
@@ -9787,6 +10165,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "doom";
+        ename = "doom";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "kensanata";
@@ -9817,6 +10196,7 @@
                                  , shrink-path }:
       melpaBuild {
         pname = "doom-modeline";
+        ename = "doom-modeline";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "seagle0128";
@@ -9851,6 +10231,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "doom-themes";
+        ename = "doom-themes";
         version = "2.1.1";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -9876,6 +10257,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dotenv-mode";
+        ename = "dotenv-mode";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "preetpalS";
@@ -9900,6 +10282,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "downplay-mode";
+        ename = "downplay-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tobias";
@@ -9925,6 +10308,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "dr-racket-like-unicode";
+        ename = "dr-racket-like-unicode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -9950,6 +10334,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dracula-theme";
+        ename = "dracula-theme";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "dracula";
@@ -9974,6 +10359,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "draft-mode";
+        ename = "draft-mode";
         version = "0.1.1";
         src = fetchFromGitLab {
           owner = "gaudecker";
@@ -9998,6 +10384,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "drag-stuff";
+        ename = "drag-stuff";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -10023,6 +10410,7 @@
                                , php-mode }:
       melpaBuild {
         pname = "drupal-mode";
+        ename = "drupal-mode";
         version = "0.7.3";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -10047,6 +10435,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "drupal-spell";
+        ename = "drupal-spell";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -10071,6 +10460,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "dtrt-indent";
+        ename = "dtrt-indent";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "jscheid";
@@ -10096,6 +10486,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ducpel";
+        ename = "ducpel";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -10125,6 +10516,7 @@
                              , s }:
       melpaBuild {
         pname = "dumb-jump";
+        ename = "dumb-jump";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "jacktasia";
@@ -10157,7 +10549,7 @@
           rev = "87db00b912be";
           sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
@@ -10177,6 +10569,7 @@
                                  , persistent-soft }:
       melpaBuild {
         pname = "dynamic-fonts";
+        ename = "dynamic-fonts";
         version = "0.6.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -10201,6 +10594,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "dynamic-ruler";
+        ename = "dynamic-ruler";
         version = "0.1.6";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -10226,6 +10620,7 @@
                         , window-layout }:
       melpaBuild {
         pname = "e2wm";
+        ename = "e2wm";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -10251,6 +10646,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "e2wm-R";
+        ename = "e2wm-R";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -10277,6 +10673,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "e2wm-direx";
+        ename = "e2wm-direx";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -10303,6 +10700,7 @@
                                  , plsense-direx }:
       melpaBuild {
         pname = "e2wm-pkgex4pl";
+        ename = "e2wm-pkgex4pl";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -10328,6 +10726,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "e2wm-sww";
+        ename = "e2wm-sww";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -10355,6 +10754,7 @@
                              , yaxception }:
       melpaBuild {
         pname = "e2wm-term";
+        ename = "e2wm-term";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -10381,6 +10781,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eacl";
+        ename = "eacl";
         version = "1.1.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -10407,12 +10808,13 @@
                              , popup }:
       melpaBuild {
         pname = "easy-hugo";
-        version = "3.3.27";
+        ename = "easy-hugo";
+        version = "3.3.30";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "3b0516c87d33a75dd777f6336fdf53be0374abcb";
-          sha256 = "1qf7wk0vx1p0y77cnzihq4zrmz1dffwabsxgf0mz770nskys6y82";
+          rev = "8bf48b973905c4ab488633226b3dfb3317d8c745";
+          sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -10432,6 +10834,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "easy-jekyll";
+        ename = "easy-jekyll";
         version = "1.6.15";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -10458,6 +10861,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "easy-kill";
+        ename = "easy-kill";
         version = "0.9.3";
         src = fetchFromGitHub {
           owner = "leoliu";
@@ -10483,6 +10887,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "easy-kill-extras";
+        ename = "easy-kill-extras";
         version = "0.9.4.1";
         src = fetchFromGitHub {
           owner = "knu";
@@ -10508,6 +10913,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "easy-repeat";
+        ename = "easy-repeat";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -10534,6 +10940,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ebal";
+        ename = "ebal";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -10561,6 +10968,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ebf";
+        ename = "ebf";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "rexim";
@@ -10589,6 +10997,7 @@
                         , seq }:
       melpaBuild {
         pname = "ebib";
+        ename = "ebib";
         version = "2.11.11";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -10619,6 +11028,7 @@
                          , yasnippet }:
       melpaBuild {
         pname = "eclim";
+        ename = "eclim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
@@ -10649,6 +11059,7 @@
                           , s }:
       melpaBuild {
         pname = "ecukes";
+        ename = "ecukes";
         version = "0.6.17";
         src = fetchFromGitHub {
           owner = "ecukes";
@@ -10676,6 +11087,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "edbi";
+        ename = "edbi";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -10701,6 +11113,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "edbi-minor-mode";
+        ename = "edbi-minor-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -10725,6 +11138,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ede-php-autoload";
+        ename = "ede-php-autoload";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "stevenremot";
@@ -10752,6 +11166,7 @@
                                                         , s }:
       melpaBuild {
         pname = "ede-php-autoload-composer-installers";
+        ename = "ede-php-autoload-composer-installers";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "xendk";
@@ -10779,6 +11194,7 @@
                                            , s }:
       melpaBuild {
         pname = "ede-php-autoload-drupal";
+        ename = "ede-php-autoload-drupal";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "xendk";
@@ -10804,6 +11220,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "edit-indirect";
+        ename = "edit-indirect";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -10828,6 +11245,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "edit-list";
+        ename = "edit-list";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "emacsmirror";
@@ -10852,6 +11270,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "edit-server";
+        ename = "edit-server";
         version = "1.15";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -10877,6 +11296,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "editorconfig";
+        ename = "editorconfig";
         version = "0.7.12";
         src = fetchFromGitHub {
           owner = "editorconfig";
@@ -10902,6 +11322,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "editorconfig-custom-majormode";
+        ename = "editorconfig-custom-majormode";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -10931,6 +11352,7 @@
                        , s }:
       melpaBuild {
         pname = "edn";
+        ename = "edn";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "expez";
@@ -10955,6 +11377,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "edts";
+        ename = "edts";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "tjarvstrand";
@@ -10981,6 +11404,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "eg";
+        ename = "eg";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "davep";
@@ -11005,6 +11429,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "egg";
+        ename = "egg";
         version = "1.0.9";
         src = fetchFromGitHub {
           owner = "byplayer";
@@ -11029,6 +11454,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "egison-mode";
+        ename = "egison-mode";
         version = "3.7.10";
         src = fetchFromGitHub {
           owner = "egisatoshi";
@@ -11055,6 +11481,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "eglot";
+        ename = "eglot";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "joaotavora";
@@ -11079,6 +11506,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "eide";
+        ename = "eide";
         version = "2.1.3";
         src = fetchgit {
           url = "https://framagit.org/eide/eide.git";
@@ -11111,6 +11539,7 @@
                        , websocket }:
       melpaBuild {
         pname = "ein";
+        ename = "ein";
         version = "0.14.1";
         src = fetchFromGitHub {
           owner = "millejoh";
@@ -11145,6 +11574,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eink-theme";
+        ename = "eink-theme";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "maio";
@@ -11169,6 +11599,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "el-autoyas";
+        ename = "el-autoyas";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -11193,6 +11624,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "el-get";
+        ename = "el-get";
         version = "5.1";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -11220,6 +11652,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "el-init";
+        ename = "el-init";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -11250,6 +11683,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "el-init-viewer";
+        ename = "el-init-viewer";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -11274,6 +11708,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "el-mock";
+        ename = "el-mock";
         version = "1.25.1";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -11299,6 +11734,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "el-patch";
+        ename = "el-patch";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -11323,6 +11759,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "el-spice";
+        ename = "el-spice";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "vedang";
@@ -11347,6 +11784,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "el-x";
+        ename = "el-x";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -11372,6 +11810,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "el2org";
+        ename = "el2org";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -11398,6 +11837,7 @@
                           , seq }:
       melpaBuild {
         pname = "elbank";
+        ename = "elbank";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -11425,6 +11865,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "elcouch";
+        ename = "elcouch";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -11449,6 +11890,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eldoc-eval";
+        ename = "eldoc-eval";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -11476,6 +11918,7 @@
                                      , names }:
       melpaBuild {
         pname = "electric-operator";
+        ename = "electric-operator";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -11501,6 +11944,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "elf-mode";
+        ename = "elf-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -11526,6 +11970,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elfeed";
+        ename = "elfeed";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -11553,6 +11998,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "elfeed-protocol";
+        ename = "elfeed-protocol";
         version = "0.5.3";
         src = fetchFromGitHub {
           owner = "fasheng";
@@ -11580,6 +12026,7 @@
                               , simple-httpd }:
       melpaBuild {
         pname = "elfeed-web";
+        ename = "elfeed-web";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -11608,6 +12055,7 @@
                              , s }:
       melpaBuild {
         pname = "elisp-def";
+        ename = "elisp-def";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -11633,6 +12081,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elisp-lint";
+        ename = "elisp-lint";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "gonewest818";
@@ -11660,6 +12109,7 @@
                               , s }:
       melpaBuild {
         pname = "elisp-refs";
+        ename = "elisp-refs";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -11685,6 +12135,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "elisp-slime-nav";
+        ename = "elisp-slime-nav";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -11711,6 +12162,7 @@
                                , pkg-info }:
       melpaBuild {
         pname = "elixir-mode";
+        ename = "elixir-mode";
         version = "2.3.1";
         src = fetchFromGitHub {
           owner = "elixir-lang";
@@ -11736,6 +12188,7 @@
                                      , yasnippet }:
       melpaBuild {
         pname = "elixir-yasnippets";
+        ename = "elixir-yasnippets";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "hisea";
@@ -11764,6 +12217,7 @@
                             , s }:
       melpaBuild {
         pname = "elm-mode";
+        ename = "elm-mode";
         version = "0.20.3";
         src = fetchFromGitHub {
           owner = "jcollard";
@@ -11790,6 +12244,7 @@
                            , s }:
       melpaBuild {
         pname = "elmacro";
+        ename = "elmacro";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -11814,6 +12269,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "elmine";
+        ename = "elmine";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -11838,6 +12294,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elpa-audit";
+        ename = "elpa-audit";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -11864,6 +12321,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "elpa-clone";
+        ename = "elpa-clone";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -11889,6 +12347,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "elpa-mirror";
+        ename = "elpa-mirror";
         version = "2.1.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -11920,6 +12379,7 @@
                         , yasnippet }:
       melpaBuild {
         pname = "elpy";
+        ename = "elpy";
         version = "1.22.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -11953,6 +12413,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "elscreen";
+        ename = "elscreen";
         version = "2018.-4.3.-4.21";
         src = fetchFromGitHub {
           owner = "knu";
@@ -11979,6 +12440,7 @@
                                , seq }:
       melpaBuild {
         pname = "elscreen-fr";
+        ename = "elscreen-fr";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -12004,6 +12466,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "elscreen-mew";
+        ename = "elscreen-mew";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -12029,6 +12492,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "elwm";
+        ename = "elwm";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -12054,6 +12518,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "elx";
+        ename = "elx";
         version = "1.2.4";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -12078,6 +12543,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "emacs-setup";
+        ename = "emacs-setup";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "echosa";
@@ -12103,6 +12569,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emacsagist";
+        ename = "emacsagist";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "echosa";
@@ -12127,6 +12594,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "emacsc";
+        ename = "emacsc";
         version = "1.2.20131027";
         src = fetchFromGitHub {
           owner = "knu";
@@ -12155,6 +12623,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "emacsql";
+        ename = "emacsql";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -12183,6 +12652,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emacsql-mysql";
+        ename = "emacsql-mysql";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -12212,6 +12682,7 @@
                                 , pg }:
       melpaBuild {
         pname = "emacsql-psql";
+        ename = "emacsql-psql";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -12240,6 +12711,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "emacsql-sqlite";
+        ename = "emacsql-sqlite";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -12264,6 +12736,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "emacsshot";
+        ename = "emacsshot";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -12289,6 +12762,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "emamux";
+        ename = "emamux";
         version = "0.14";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -12313,6 +12787,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "emaps";
+        ename = "emaps";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -12339,6 +12814,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "embrace";
+        ename = "embrace";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -12363,6 +12839,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emmet-mode";
+        ename = "emmet-mode";
         version = "1.0.8";
         src = fetchFromGitHub {
           owner = "smihica";
@@ -12388,6 +12865,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "emms";
+        ename = "emms";
         version = "5.0";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
@@ -12413,6 +12891,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "emms-mode-line-cycle";
+        ename = "emms-mode-line-cycle";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -12438,6 +12917,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "emms-player-mpv";
+        ename = "emms-player-mpv";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -12465,6 +12945,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "emms-player-simple-mpv";
+        ename = "emms-player-simple-mpv";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "momomo5717";
@@ -12490,6 +12971,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "emms-state";
+        ename = "emms-state";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -12516,6 +12998,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "emoji-cheat-sheet-plus";
+        ename = "emoji-cheat-sheet-plus";
         version = "1.2.1";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -12540,6 +13023,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "emoji-fontset";
+        ename = "emoji-fontset";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -12567,6 +13051,7 @@
                            , seq }:
       melpaBuild {
         pname = "emojify";
+        ename = "emojify";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -12602,6 +13087,7 @@
                        , s }:
       melpaBuild {
         pname = "emr";
+        ename = "emr";
         version = "0.3.7";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -12638,6 +13124,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "engine-mode";
+        ename = "engine-mode";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "hrs";
@@ -12663,6 +13150,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "enh-ruby-mode";
+        ename = "enh-ruby-mode";
         version = "20180330";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -12687,6 +13175,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "enlive";
+        ename = "enlive";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -12711,6 +13200,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "enotify";
+        ename = "enotify";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -12742,6 +13232,7 @@
                           , yasnippet }:
       melpaBuild {
         pname = "ensime";
+        ename = "ensime";
         version = "2.0.2";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -12778,6 +13269,7 @@
                              , s }:
       melpaBuild {
         pname = "eopengrok";
+        ename = "eopengrok";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "youngker";
@@ -12804,6 +13296,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epc";
+        ename = "epc";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -12831,6 +13324,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "epkg";
+        ename = "epkg";
         version = "3.1.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -12856,6 +13350,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epl";
+        ename = "epl";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "cask";
@@ -12882,6 +13377,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "epm";
+        ename = "epm";
         version = "0.1.-2.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -12907,6 +13403,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erc-crypt";
+        ename = "erc-crypt";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "atomontage";
@@ -12941,7 +13438,7 @@
           rev = "a53227513692";
           sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
           sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
           name = "erc-hipchatify";
@@ -12958,6 +13455,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "erc-hl-nicks";
+        ename = "erc-hl-nicks";
         version = "1.3.3";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -12984,6 +13482,7 @@
                                      , switch-buffer-functions }:
       melpaBuild {
         pname = "erc-scrolltoplace";
+        ename = "erc-scrolltoplace";
         version = "0.1.0";
         src = fetchFromGitLab {
           owner = "jgkamat";
@@ -13010,6 +13509,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "erc-twitch";
+        ename = "erc-twitch";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -13034,6 +13534,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "erc-youtube";
+        ename = "erc-youtube";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "kidd";
@@ -13058,6 +13559,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ercn";
+        ename = "ercn";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -13083,6 +13585,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "erefactor";
+        ename = "erefactor";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -13110,6 +13613,7 @@
                                   , undo-tree }:
       melpaBuild {
         pname = "ergoemacs-mode";
+        ename = "ergoemacs-mode";
         version = "5.16.10.12";
         src = fetchFromGitHub {
           owner = "ergoemacs";
@@ -13135,6 +13639,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "erlang";
+        ename = "erlang";
         version = "21.0.3";
         src = fetchFromGitHub {
           owner = "erlang";
@@ -13159,6 +13664,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ert-async";
+        ename = "ert-async";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -13184,6 +13690,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ert-junit";
+        ename = "ert-junit";
         version = "0.3";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
@@ -13213,6 +13720,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "ert-runner";
+        ename = "ert-runner";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -13238,6 +13746,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "es-lib";
+        ename = "es-lib";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -13265,6 +13774,7 @@
                            , spark }:
       melpaBuild {
         pname = "es-mode";
+        ename = "es-mode";
         version = "4.3.0";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -13291,6 +13801,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "es-windows";
+        ename = "es-windows";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -13316,6 +13827,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "esa";
+        ename = "esa";
         version = "0.8.13";
         src = fetchFromGitHub {
           owner = "nabinno";
@@ -13342,6 +13854,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "esh-autosuggest";
+        ename = "esh-autosuggest";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -13367,6 +13880,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "esh-help";
+        ename = "esh-help";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "tom-tan";
@@ -13391,6 +13905,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "eshell-autojump";
+        ename = "eshell-autojump";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -13416,6 +13931,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "eshell-bookmark";
+        ename = "eshell-bookmark";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -13442,6 +13958,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "eshell-did-you-mean";
+        ename = "eshell-did-you-mean";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -13469,6 +13986,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "eshell-git-prompt";
+        ename = "eshell-git-prompt";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -13493,6 +14011,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "eshell-prompt-extras";
+        ename = "eshell-prompt-extras";
         version = "0.96";
         src = fetchFromGitHub {
           owner = "hiddenlotus";
@@ -13518,6 +14037,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "eshell-up";
+        ename = "eshell-up";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "peterwvj";
@@ -13543,6 +14063,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "eshell-z";
+        ename = "eshell-z";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -13567,6 +14088,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "eslint-fix";
+        ename = "eslint-fix";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "codesuki";
@@ -13593,6 +14115,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "eslintd-fix";
+        ename = "eslintd-fix";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -13620,6 +14143,7 @@
                           , s }:
       melpaBuild {
         pname = "espuds";
+        ename = "espuds";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "ecukes";
@@ -13645,6 +14169,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ess";
+        ename = "ess";
         version = "17.11";
         src = fetchFromGitHub {
           owner = "emacs-ess";
@@ -13672,6 +14197,7 @@
                                    , popup }:
       melpaBuild {
         pname = "ess-R-data-view";
+        ename = "ess-R-data-view";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -13696,6 +14222,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "ess-smart-underscore";
+        ename = "ess-smart-underscore";
         version = "0.79";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -13722,6 +14249,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "esup";
+        ename = "esup";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -13746,6 +14274,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "esxml";
+        ename = "esxml";
         version = "0.3.4";
         src = fetchFromGitHub {
           owner = "tali713";
@@ -13773,6 +14302,7 @@
                                   , xterm-color }:
       melpaBuild {
         pname = "eterm-256color";
+        ename = "eterm-256color";
         version = "0.3.13";
         src = fetchFromGitHub {
           owner = "dieggsy";
@@ -13797,6 +14327,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ethan-wspace";
+        ename = "ethan-wspace";
         version = "0.7.1";
         src = fetchFromGitHub {
           owner = "glasserc";
@@ -13824,6 +14355,7 @@
                                 , paredit }:
       melpaBuild {
         pname = "eval-in-repl";
+        ename = "eval-in-repl";
         version = "0.9.6";
         src = fetchFromGitHub {
           owner = "kaz-yos";
@@ -13850,6 +14382,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "eval-sexp-fu";
+        ename = "eval-sexp-fu";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "hchbaw";
@@ -13875,6 +14408,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evalator";
+        ename = "evalator";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "seanirby";
@@ -13903,6 +14437,7 @@
                         , undo-tree }:
       melpaBuild {
         pname = "evil";
+        ename = "evil";
         version = "1.2.13";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -13929,6 +14464,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-anzu";
+        ename = "evil-anzu";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -13954,6 +14490,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "evil-args";
+        ename = "evil-args";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "wcsmith";
@@ -13981,6 +14518,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-colemak-basics";
+        ename = "evil-colemak-basics";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -14006,6 +14544,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-commentary";
+        ename = "evil-commentary";
         version = "2.1.1";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -14033,6 +14572,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-embrace";
+        ename = "evil-embrace";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -14060,6 +14600,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-escape";
+        ename = "evil-escape";
         version = "3.14";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -14086,6 +14627,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "evil-iedit-state";
+        ename = "evil-iedit-state";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -14111,6 +14653,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-leader";
+        ename = "evil-leader";
         version = "0.4.3";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -14138,6 +14681,7 @@
                                    , smartparens }:
       melpaBuild {
         pname = "evil-lisp-state";
+        ename = "evil-lisp-state";
         version = "8.2";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -14164,6 +14708,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-magit";
+        ename = "evil-magit";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -14189,6 +14734,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "evil-mark-replace";
+        ename = "evil-mark-replace";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -14214,6 +14760,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-matchit";
+        ename = "evil-matchit";
         version = "2.2.8";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -14241,6 +14788,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "evil-mc";
+        ename = "evil-mc";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "gabesoft";
@@ -14269,6 +14817,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-multiedit";
+        ename = "evil-multiedit";
         version = "1.3.8";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -14294,6 +14843,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-nerd-commenter";
+        ename = "evil-nerd-commenter";
         version = "3.2.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -14318,6 +14868,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "evil-numbers";
+        ename = "evil-numbers";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -14344,6 +14895,7 @@
                                , opener }:
       melpaBuild {
         pname = "evil-opener";
+        ename = "evil-opener";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "0robustus1";
@@ -14370,6 +14922,7 @@
                             , org }:
       melpaBuild {
         pname = "evil-org";
+        ename = "evil-org";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "Somelauw";
@@ -14395,6 +14948,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-quickscope";
+        ename = "evil-quickscope";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "blorbx";
@@ -14421,6 +14975,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "evil-replace-with-char";
+        ename = "evil-replace-with-char";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -14446,6 +15001,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "evil-rsi";
+        ename = "evil-rsi";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -14471,6 +15027,7 @@
                                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-search-highlight-persist";
+        ename = "evil-search-highlight-persist";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "naclander";
@@ -14498,6 +15055,7 @@
                                     , smartparens }:
       melpaBuild {
         pname = "evil-smartparens";
+        ename = "evil-smartparens";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "expez";
@@ -14525,6 +15083,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-snipe";
+        ename = "evil-snipe";
         version = "2.0.8";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -14550,6 +15109,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-space";
+        ename = "evil-space";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "linktohack";
@@ -14577,6 +15137,7 @@
                                           , string-inflection }:
       melpaBuild {
         pname = "evil-string-inflection";
+        ename = "evil-string-inflection";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -14602,6 +15163,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "evil-surround";
+        ename = "evil-surround";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -14627,6 +15189,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "evil-swap-keys";
+        ename = "evil-swap-keys";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -14652,6 +15215,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "evil-test-helpers";
+        ename = "evil-test-helpers";
         version = "1.2.13";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -14678,6 +15242,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "evil-text-object-python";
+        ename = "evil-text-object-python";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -14704,6 +15269,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "evil-textobj-anyblock";
+        ename = "evil-textobj-anyblock";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -14729,6 +15295,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "evil-tutor";
+        ename = "evil-tutor";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "syl20bnr";
@@ -14755,6 +15322,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "evil-visual-mark-mode";
+        ename = "evil-visual-mark-mode";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "roman";
@@ -14780,6 +15348,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "evil-visual-replace";
+        ename = "evil-visual-replace";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "troyp";
@@ -14805,6 +15374,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "evil-visualstar";
+        ename = "evil-visualstar";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bling";
@@ -14831,6 +15401,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "evm";
+        ename = "evm";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -14855,6 +15426,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "eww-lnum";
+        ename = "eww-lnum";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -14881,6 +15453,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "exato";
+        ename = "exato";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "ninrod";
@@ -14905,6 +15478,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "exec-path-from-shell";
+        ename = "exec-path-from-shell";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -14930,6 +15504,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "exiftool";
+        ename = "exiftool";
         version = "0.3";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
@@ -14953,6 +15528,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "expand-region";
+        ename = "expand-region";
         version = "0.11.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -14978,6 +15554,7 @@
                            , string-utils }:
       melpaBuild {
         pname = "express";
+        ename = "express";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -15003,6 +15580,7 @@
                                  , s }:
       melpaBuild {
         pname = "exsqlaim-mode";
+        ename = "exsqlaim-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "ahmadnazir";
@@ -15027,6 +15605,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "extend-dnd";
+        ename = "extend-dnd";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -15052,6 +15631,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "extmap";
+        ename = "extmap";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -15083,6 +15663,7 @@
                           , switch-window }:
       melpaBuild {
         pname = "exwm-x";
+        ename = "exwm-x";
         version = "1.8.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -15117,6 +15698,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "eyebrowse";
+        ename = "eyebrowse";
         version = "0.7.7";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -15141,6 +15723,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "eziam-theme";
+        ename = "eziam-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "thblt";
@@ -15167,6 +15750,7 @@
                      , s }:
       melpaBuild {
         pname = "f";
+        ename = "f";
         version = "0.20.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -15194,6 +15778,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "f3";
+        ename = "f3";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -15218,6 +15803,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "fabric";
+        ename = "fabric";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -15242,6 +15828,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "factlog";
+        ename = "factlog";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -15266,6 +15853,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "faff-theme";
+        ename = "faff-theme";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "WJCFerguson";
@@ -15291,6 +15879,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fancy-battery";
+        ename = "fancy-battery";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -15315,6 +15904,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fancy-narrow";
+        ename = "fancy-narrow";
         version = "0.9.5";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -15341,6 +15931,7 @@
                            , w3m }:
       melpaBuild {
         pname = "fastdef";
+        ename = "fastdef";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -15365,6 +15956,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "fastnav";
+        ename = "fastnav";
         version = "1.0.7";
         src = fetchFromGitHub {
           owner = "gleber";
@@ -15389,6 +15981,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "faust-mode";
+        ename = "faust-mode";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "rukano";
@@ -15415,6 +16008,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "faustine";
+        ename = "faustine";
         version = "0.4";
         src = fetchgit {
           url = "https://bitbucket.org/yphil/faustine";
@@ -15438,6 +16032,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fcitx";
+        ename = "fcitx";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -15462,6 +16057,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "feature-mode";
+        ename = "feature-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "michaelklishin";
@@ -15486,6 +16082,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "fill-column-indicator";
+        ename = "fill-column-indicator";
         version = "1.90";
         src = fetchFromGitHub {
           owner = "alpaker";
@@ -15511,6 +16108,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "fill-function-arguments";
+        ename = "fill-function-arguments";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -15539,6 +16137,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "finalize";
+        ename = "finalize";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -15564,6 +16163,7 @@
                                         , pinyinlib }:
       melpaBuild {
         pname = "find-by-pinyin-dired";
+        ename = "find-by-pinyin-dired";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -15590,6 +16190,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "find-file-in-project";
+        ename = "find-file-in-project";
         version = "5.6.8";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -15614,6 +16215,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "find-file-in-repository";
+        ename = "find-file-in-repository";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "hoffstaetter";
@@ -15639,6 +16241,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fiplr";
+        ename = "fiplr";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "grizzl";
@@ -15666,6 +16269,7 @@
                                       , popwin }:
       melpaBuild {
         pname = "firefox-controller";
+        ename = "firefox-controller";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -15690,6 +16294,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fireplace";
+        ename = "fireplace";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "johanvts";
@@ -15714,6 +16319,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "firestarter";
+        ename = "firestarter";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -15739,6 +16345,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fish-mode";
+        ename = "fish-mode";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "wwwjfy";
@@ -15764,6 +16371,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fix-input";
+        ename = "fix-input";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -15788,6 +16396,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "fix-muscle-memory";
+        ename = "fix-muscle-memory";
         version = "0.93";
         src = fetchFromGitHub {
           owner = "jonnay";
@@ -15814,6 +16423,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fix-word";
+        ename = "fix-word";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -15844,6 +16454,7 @@
                           , tabulated-list ? null }:
       melpaBuild {
         pname = "fixmee";
+        ename = "fixmee";
         version = "0.8.6";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -15876,6 +16487,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flatui-dark-theme";
+        ename = "flatui-dark-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "theasp";
@@ -15903,6 +16515,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flex-compile";
+        ename = "flex-compile";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "plandes";
@@ -15929,6 +16542,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "floobits";
+        ename = "floobits";
         version = "1.9.2";
         src = fetchFromGitHub {
           owner = "Floobits";
@@ -15954,6 +16568,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flow-minor-mode";
+        ename = "flow-minor-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "an-sh";
@@ -15980,6 +16595,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "flower";
+        ename = "flower";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
@@ -16005,6 +16621,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "flx";
+        ename = "flx";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -16031,6 +16648,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "flx-ido";
+        ename = "flx-ido";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -16060,6 +16678,7 @@
                             , seq }:
       melpaBuild {
         pname = "flycheck";
+        ename = "flycheck";
         version = "31";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16085,6 +16704,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-apertium";
+        ename = "flycheck-apertium";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -16112,6 +16732,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-cask";
+        ename = "flycheck-cask";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16138,6 +16759,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "flycheck-checkbashisms";
+        ename = "flycheck-checkbashisms";
         version = "1.5";
         src = fetchFromGitHub {
           owner = "Gnouc";
@@ -16164,6 +16786,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-checkpatch";
+        ename = "flycheck-checkpatch";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "zpp0";
@@ -16192,6 +16815,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-clojure";
+        ename = "flycheck-clojure";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -16219,6 +16843,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "flycheck-color-mode-line";
+        ename = "flycheck-color-mode-line";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16244,6 +16869,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-crystal";
+        ename = "flycheck-crystal";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
@@ -16270,6 +16896,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flycheck-dmd-dub";
+        ename = "flycheck-dmd-dub";
         version = "0.12";
         src = fetchFromGitHub {
           owner = "atilaneves";
@@ -16296,6 +16923,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flycheck-gometalinter";
+        ename = "flycheck-gometalinter";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "favadi";
@@ -16326,6 +16954,7 @@
                                     , seq }:
       melpaBuild {
         pname = "flycheck-haskell";
+        ename = "flycheck-haskell";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16351,6 +16980,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "flycheck-hdevtools";
+        ename = "flycheck-hdevtools";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16378,6 +17008,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-irony";
+        ename = "flycheck-irony";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -16403,6 +17034,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-joker";
+        ename = "flycheck-joker";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "candid82";
@@ -16429,6 +17061,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-julia";
+        ename = "flycheck-julia";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "gdkrmr";
@@ -16454,6 +17087,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-kotlin";
+        ename = "flycheck-kotlin";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "whirm";
@@ -16479,6 +17113,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-ledger";
+        ename = "flycheck-ledger";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -16505,6 +17140,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flycheck-mix";
+        ename = "flycheck-mix";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "tomekowal";
@@ -16531,6 +17167,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-mmark";
+        ename = "flycheck-mmark";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "mmark-md";
@@ -16558,6 +17195,7 @@
                                        , nim-mode }:
       melpaBuild {
         pname = "flycheck-nimsuggest";
+        ename = "flycheck-nimsuggest";
         version = "0.8.1";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -16584,6 +17222,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-objc-clang";
+        ename = "flycheck-objc-clang";
         version = "2.0.2";
         src = fetchFromGitHub {
           owner = "GyazSquare";
@@ -16612,6 +17251,7 @@
                                   , merlin }:
       melpaBuild {
         pname = "flycheck-ocaml";
+        ename = "flycheck-ocaml";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16638,6 +17278,7 @@
                                     , package-lint }:
       melpaBuild {
         pname = "flycheck-package";
+        ename = "flycheck-package";
         version = "0.12";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -16665,7 +17306,8 @@
                                     , phpstan }:
       melpaBuild {
         pname = "flycheck-phpstan";
-        version = "0.2.1";
+        ename = "flycheck-phpstan";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpstan.el";
@@ -16690,6 +17332,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flycheck-pony";
+        ename = "flycheck-pony";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -16717,6 +17360,7 @@
                                       , popup }:
       melpaBuild {
         pname = "flycheck-popup-tip";
+        ename = "flycheck-popup-tip";
         version = "0.12.2";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16744,6 +17388,7 @@
                                     , pos-tip }:
       melpaBuild {
         pname = "flycheck-pos-tip";
+        ename = "flycheck-pos-tip";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "flycheck";
@@ -16769,6 +17414,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "flycheck-pycheckers";
+        ename = "flycheck-pycheckers";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "msherry";
@@ -16794,6 +17440,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-rebar3";
+        ename = "flycheck-rebar3";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "joedevivo";
@@ -16821,6 +17468,7 @@
                                   , rtags }:
       melpaBuild {
         pname = "flycheck-rtags";
+        ename = "flycheck-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -16849,6 +17497,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flycheck-status-emoji";
+        ename = "flycheck-status-emoji";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "liblit";
@@ -16875,6 +17524,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-swift";
+        ename = "flycheck-swift";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "swift-emacs";
@@ -16901,6 +17551,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flycheck-swift3";
+        ename = "flycheck-swift3";
         version = "2.0.2";
         src = fetchFromGitHub {
           owner = "GyazSquare";
@@ -16928,6 +17579,7 @@
                                 , popup }:
       melpaBuild {
         pname = "flycheck-tip";
+        ename = "flycheck-tip";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -16954,6 +17606,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flycheck-title";
+        ename = "flycheck-title";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -16979,6 +17632,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "flycheck-yamllint";
+        ename = "flycheck-yamllint";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -17008,6 +17662,7 @@
                                  , ycmd }:
       melpaBuild {
         pname = "flycheck-ycmd";
+        ename = "flycheck-ycmd";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -17033,6 +17688,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-coffee";
+        ename = "flymake-coffee";
         version = "0.12";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17058,6 +17714,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flymake-css";
+        ename = "flymake-css";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17083,6 +17740,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-cursor";
+        ename = "flymake-cursor";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "flymake";
@@ -17107,6 +17765,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-easy";
+        ename = "flymake-easy";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17131,6 +17790,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "flymake-gjshint";
+        ename = "flymake-gjshint";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -17156,6 +17816,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-haml";
+        ename = "flymake-haml";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17181,6 +17842,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flymake-haskell-multi";
+        ename = "flymake-haskell-multi";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17206,6 +17868,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flymake-hlint";
+        ename = "flymake-hlint";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17230,6 +17893,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "flymake-jslint";
+        ename = "flymake-jslint";
         version = "0.23";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17255,6 +17919,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-json";
+        ename = "flymake-json";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17280,6 +17945,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-less";
+        ename = "flymake-less";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17305,6 +17971,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "flymake-perlcritic";
+        ename = "flymake-perlcritic";
         version = "1.0.3";
         src = fetchFromGitHub {
           owner = "illusori";
@@ -17330,6 +17997,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "flymake-php";
+        ename = "flymake-php";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17355,6 +18023,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "flymake-python-pyflakes";
+        ename = "flymake-python-pyflakes";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17380,6 +18049,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-ruby";
+        ename = "flymake-ruby";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17405,6 +18075,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "flymake-sass";
+        ename = "flymake-sass";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17430,6 +18101,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flymake-shell";
+        ename = "flymake-shell";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -17454,6 +18126,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct";
+        ename = "flyspell-correct";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -17480,6 +18153,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct-helm";
+        ename = "flyspell-correct-helm";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -17506,6 +18180,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "flyspell-correct-ivy";
+        ename = "flyspell-correct-ivy";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -17532,6 +18207,7 @@
                                           , popup }:
       melpaBuild {
         pname = "flyspell-correct-popup";
+        ename = "flyspell-correct-popup";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "d12frosted";
@@ -17556,6 +18232,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "flyspell-lazy";
+        ename = "flyspell-lazy";
         version = "0.6.10";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -17581,6 +18258,7 @@
                                   , popup }:
       melpaBuild {
         pname = "flyspell-popup";
+        ename = "flyspell-popup";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -17609,6 +18287,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "fn";
+        ename = "fn";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "troyp";
@@ -17635,6 +18314,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "focus";
+        ename = "focus";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -17659,6 +18339,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fold-dwim";
+        ename = "fold-dwim";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "emacsattic";
@@ -17684,6 +18365,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fold-dwim-org";
+        ename = "fold-dwim-org";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -17708,6 +18390,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fold-this";
+        ename = "fold-this";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -17734,6 +18417,7 @@
                               , persistent-soft }:
       melpaBuild {
         pname = "font-utils";
+        ename = "font-utils";
         version = "0.7.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -17760,6 +18444,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "fontawesome";
+        ename = "fontawesome";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -17784,6 +18469,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "fontify-face";
+        ename = "fontify-face";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -17813,6 +18499,7 @@
                                 , s }:
       melpaBuild {
         pname = "foreman-mode";
+        ename = "foreman-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -17837,6 +18524,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "form-feed";
+        ename = "form-feed";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -17861,6 +18549,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "format-sql";
+        ename = "format-sql";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -17885,6 +18574,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "fortune-cookie";
+        ename = "fortune-cookie";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "andschwa";
@@ -17910,6 +18600,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fountain-mode";
+        ename = "fountain-mode";
         version = "2.5.3";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -17936,6 +18627,7 @@
                                     , seq }:
       melpaBuild {
         pname = "frames-only-mode";
+        ename = "frames-only-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -17961,6 +18653,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "frameshot";
+        ename = "frameshot";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -17986,6 +18679,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "free-keys";
+        ename = "free-keys";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -18010,6 +18704,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "fringe-helper";
+        ename = "fringe-helper";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -18034,6 +18729,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "fsbot-data-browser";
+        ename = "fsbot-data-browser";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "benaiah";
@@ -18065,6 +18761,7 @@
                                , s }:
       melpaBuild {
         pname = "fsharp-mode";
+        ename = "fsharp-mode";
         version = "1.9.12";
         src = fetchFromGitHub {
           owner = "rneatherway";
@@ -18099,6 +18796,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "fstar-mode";
+        ename = "fstar-mode";
         version = "0.9.4.0";
         src = fetchFromGitHub {
           owner = "FStarLang";
@@ -18123,6 +18821,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "full-ack";
+        ename = "full-ack";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -18148,6 +18847,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fullframe";
+        ename = "fullframe";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tomterl";
@@ -18173,6 +18873,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "function-args";
+        ename = "function-args";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -18205,7 +18906,7 @@
           rev = "784e3147196bfe82ea9499628467335ea1d036f9";
           sha256 = "07dqqpacvap034jzvdvnpjyryzicbvjx2imnsghsxw9m52jsb9wn";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
           sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq";
           name = "futhark-mode";
@@ -18222,6 +18923,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "fuzzy";
+        ename = "fuzzy";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -18246,6 +18948,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "fvwm-mode";
+        ename = "fvwm-mode";
         version = "1.6.4";
         src = fetchFromGitHub {
           owner = "theBlackDragon";
@@ -18270,6 +18973,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "fwb-cmds";
+        ename = "fwb-cmds";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -18295,6 +18999,7 @@
                              , s }:
       melpaBuild {
         pname = "fxrd-mode";
+        ename = "fxrd-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "msherry";
@@ -18320,6 +19025,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "fzf";
+        ename = "fzf";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "bling";
@@ -18345,6 +19051,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gams-mode";
+        ename = "gams-mode";
         version = "6.5";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
@@ -18369,6 +19076,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "gather";
+        ename = "gather";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -18395,6 +19103,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "geben";
+        ename = "geben";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -18422,6 +19131,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "geben-helm-projectile";
+        ename = "geben-helm-projectile";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -18446,6 +19156,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "geiser";
+        ename = "geiser";
         version = "0.10";
         src = fetchFromGitLab {
           owner = "jaor";
@@ -18474,6 +19185,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "genrnc";
+        ename = "genrnc";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -18498,6 +19210,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "german-holidays";
+        ename = "german-holidays";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -18524,6 +19237,7 @@
                       , s }:
       melpaBuild {
         pname = "gf";
+        ename = "gf";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "grammaticalframework";
@@ -18548,6 +19262,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ggo-mode";
+        ename = "ggo-mode";
         version = "20130521";
         src = fetchFromGitHub {
           owner = "mkjunker";
@@ -18574,6 +19289,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ggtags";
+        ename = "ggtags";
         version = "0.8.12";
         src = fetchFromGitHub {
           owner = "leoliu";
@@ -18601,6 +19317,7 @@
                       , pcache }:
       melpaBuild {
         pname = "gh";
+        ename = "gh";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -18626,6 +19343,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ghc";
+        ename = "ghc";
         version = "5.8.0.0";
         src = fetchFromGitHub {
           owner = "DanielG";
@@ -18651,6 +19369,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ghc-imported-from";
+        ename = "ghc-imported-from";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -18675,6 +19394,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ghq";
+        ename = "ghq";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rcoedo";
@@ -18701,6 +19421,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "ghub";
+        ename = "ghub";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "magit";
@@ -18728,6 +19449,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ghub-plus";
+        ename = "ghub+";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -18754,6 +19476,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "gist";
+        ename = "gist";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -18781,6 +19504,7 @@
                        , s }:
       melpaBuild {
         pname = "git";
+        ename = "git";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -18805,6 +19529,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "git-annex";
+        ename = "git-annex";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -18830,6 +19555,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-attr";
+        ename = "git-attr";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "arnested";
@@ -18854,6 +19580,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "git-auto-commit-mode";
+        ename = "git-auto-commit-mode";
         version = "4.4.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -18881,6 +19608,7 @@
                                , with-editor }:
       melpaBuild {
         pname = "git-command";
+        ename = "git-command";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -18908,6 +19636,7 @@
                               , with-editor }:
       melpaBuild {
         pname = "git-commit";
+        ename = "git-commit";
         version = "2.13.0";
         src = fetchFromGitHub {
           owner = "magit";
@@ -18938,6 +19667,7 @@
                                            , s }:
       melpaBuild {
         pname = "git-commit-insert-issue";
+        ename = "git-commit-insert-issue";
         version = "0.3.1";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
@@ -18964,6 +19694,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "git-gutter";
+        ename = "git-gutter";
         version = "0.90";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -18992,6 +19723,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-fringe";
+        ename = "git-gutter-fringe";
         version = "0.23";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -19018,6 +19750,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-fringe-plus";
+        ename = "git-gutter-fringe+";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -19043,6 +19776,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "git-gutter-plus";
+        ename = "git-gutter+";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -19068,6 +19802,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-lens";
+        ename = "git-lens";
         version = "0.7.0";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -19093,6 +19828,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "git-link";
+        ename = "git-link";
         version = "0.7.1";
         src = fetchFromGitHub {
           owner = "sshaw";
@@ -19119,6 +19855,7 @@
                                  , popup }:
       melpaBuild {
         pname = "git-messenger";
+        ename = "git-messenger";
         version = "0.18";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -19143,6 +19880,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "git-ps1-mode";
+        ename = "git-ps1-mode";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -19168,6 +19906,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "git-timemachine";
+        ename = "git-timemachine";
         version = "4.5";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -19193,6 +19932,7 @@
                                        , s }:
       melpaBuild {
         pname = "git-wip-timemachine";
+        ename = "git-wip-timemachine";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "itsjeyd";
@@ -19217,6 +19957,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "gitattributes-mode";
+        ename = "gitattributes-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
@@ -19241,6 +19982,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gitconfig";
+        ename = "gitconfig";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -19265,6 +20007,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gitconfig-mode";
+        ename = "gitconfig-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
@@ -19290,6 +20033,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "github-browse-file";
+        ename = "github-browse-file";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "osener";
@@ -19317,6 +20061,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "github-clone";
+        ename = "github-clone";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "dgtized";
@@ -19344,6 +20089,7 @@
                                , package-build }:
       melpaBuild {
         pname = "github-elpa";
+        ename = "github-elpa";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -19369,6 +20115,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "github-notifier";
+        ename = "github-notifier";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -19395,6 +20142,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "github-search";
+        ename = "github-search";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -19419,6 +20167,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "gitignore-mode";
+        ename = "gitignore-mode";
         version = "1.2.7";
         src = fetchFromGitHub {
           owner = "magit";
@@ -19447,6 +20196,7 @@
                           , s }:
       melpaBuild {
         pname = "gitlab";
+        ename = "gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -19473,6 +20223,7 @@
                                   , yaml-mode }:
       melpaBuild {
         pname = "gitlab-ci-mode";
+        ename = "gitlab-ci-mode";
         version = "20180306.1";
         src = fetchFromGitLab {
           owner = "joewreschnig";
@@ -19500,6 +20251,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "gitlab-ci-mode-flycheck";
+        ename = "gitlab-ci-mode-flycheck";
         version = "20180304.1";
         src = fetchFromGitLab {
           owner = "joewreschnig";
@@ -19525,6 +20277,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "gitpatch";
+        ename = "gitpatch";
         version = "0.5.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -19551,6 +20304,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "gitter";
+        ename = "gitter";
         version = "1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -19575,6 +20329,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gl-conf-mode";
+        ename = "gl-conf-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "llloret";
@@ -19601,6 +20356,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "glab";
+        ename = "glab";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "magit";
@@ -19626,6 +20382,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "gmail-message-mode";
+        ename = "gmail-message-mode";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -19650,6 +20407,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "gmail2bbdb";
+        ename = "gmail2bbdb";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -19674,6 +20432,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "gmpl-mode";
+        ename = "gmpl-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -19698,6 +20457,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "gntp";
+        ename = "gntp";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tekai";
@@ -19722,6 +20482,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gnuplot";
+        ename = "gnuplot";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "bruceravel";
@@ -19747,6 +20508,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gnus-desktop-notify";
+        ename = "gnus-desktop-notify";
         version = "1.4";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -19773,6 +20535,7 @@
                                  , yaxception }:
       melpaBuild {
         pname = "gnus-x-gm-raw";
+        ename = "gnus-x-gm-raw";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -19799,6 +20562,7 @@
                                , s }:
       melpaBuild {
         pname = "go-add-tags";
+        ename = "go-add-tags";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -19824,6 +20588,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "go-autocomplete";
+        ename = "go-autocomplete";
         version = "20170907";
         src = fetchFromGitHub {
           owner = "nsf";
@@ -19850,6 +20615,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "go-direx";
+        ename = "go-direx";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -19875,6 +20641,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "go-dlv";
+        ename = "go-dlv";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "benma";
@@ -19901,6 +20668,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "go-eldoc";
+        ename = "go-eldoc";
         version = "0.30";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -19925,6 +20693,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "go-errcheck";
+        ename = "go-errcheck";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -19950,6 +20719,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "go-fill-struct";
+        ename = "go-fill-struct";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -19976,6 +20746,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-guru";
+        ename = "go-guru";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -20002,6 +20773,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-impl";
+        ename = "go-impl";
         version = "0.14";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -20026,6 +20798,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "go-mode";
+        ename = "go-mode";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -20053,6 +20826,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "go-playground";
+        ename = "go-playground";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -20078,6 +20852,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "go-rename";
+        ename = "go-rename";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dominikh";
@@ -20104,6 +20879,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "go-scratch";
+        ename = "go-scratch";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "shosti";
@@ -20130,6 +20906,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "go-tag";
+        ename = "go-tag";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -20154,6 +20931,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "godoctor";
+        ename = "godoctor";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "microamp";
@@ -20178,6 +20956,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "golden-ratio";
+        ename = "golden-ratio";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "roman";
@@ -20202,6 +20981,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "google-maps";
+        ename = "google-maps";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "jd";
@@ -20227,6 +21007,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "google-this";
+        ename = "google-this";
         version = "1.12";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -20251,6 +21032,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "google-translate";
+        ename = "google-translate";
         version = "0.11.14";
         src = fetchFromGitHub {
           owner = "atykhonov";
@@ -20276,6 +21058,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "gorepl-mode";
+        ename = "gorepl-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "manute";
@@ -20304,6 +21087,7 @@
                           , s }:
       melpaBuild {
         pname = "gotest";
+        ename = "gotest";
         version = "0.14.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -20328,6 +21112,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "gotham-theme";
+        ename = "gotham-theme";
         version = "1.1.8";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -20352,6 +21137,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "goto-chg";
+        ename = "goto-chg";
         version = "1.7.2";
         src = fetchFromGitHub {
           owner = "emacs-evil";
@@ -20377,6 +21163,7 @@
                             , s }:
       melpaBuild {
         pname = "goto-gem";
+        ename = "goto-gem";
         version = "1.2";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -20401,6 +21188,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "goto-last-change";
+        ename = "goto-last-change";
         version = "1.2.1";
         src = fetchFromGitHub {
           owner = "camdez";
@@ -20430,6 +21218,7 @@
                         , s }:
       melpaBuild {
         pname = "govc";
+        ename = "govc";
         version = "0.18.0";
         src = fetchFromGitHub {
           owner = "vmware";
@@ -20455,6 +21244,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "gpastel";
+        ename = "gpastel";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -20480,6 +21270,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "grab-mac-link";
+        ename = "grab-mac-link";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -20506,6 +21297,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "grab-x-link";
+        ename = "grab-x-link";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -20531,6 +21323,7 @@
                                , s }:
       melpaBuild {
         pname = "gradle-mode";
+        ename = "gradle-mode";
         version = "0.5.5";
         src = fetchFromGitHub {
           owner = "jacobono";
@@ -20556,6 +21349,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "grails";
+        ename = "grails";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "lifeisfoo";
@@ -20580,6 +21374,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "grails-mode";
+        ename = "grails-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
@@ -20607,6 +21402,7 @@
                                           , projectile }:
       melpaBuild {
         pname = "grails-projectile-mode";
+        ename = "grails-projectile-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "yveszoundi";
@@ -20631,6 +21427,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "grandshell-theme";
+        ename = "grandshell-theme";
         version = "1.3";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/grandshell-theme.git";
@@ -20665,6 +21462,7 @@
                             , web-mode }:
       melpaBuild {
         pname = "graphene";
+        ename = "graphene";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -20701,6 +21499,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "graphene-meta-theme";
+        ename = "graphene-meta-theme";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -20725,6 +21524,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "graphviz-dot-mode";
+        ename = "graphviz-dot-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "ppareit";
@@ -20749,6 +21549,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "grapnel";
+        ename = "grapnel";
         version = "0.5.3";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -20781,7 +21582,7 @@
           rev = "1ae8eae88117";
           sha256 = "1sl3d5759fjm98pb50ykz2c05czb2298ipccwj2qz2hdzq63hfv8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
@@ -20798,6 +21599,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "green-is-the-new-black-theme";
+        ename = "green-is-the-new-black-theme";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "fredcamps";
@@ -20822,6 +21624,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "green-screen-theme";
+        ename = "green-screen-theme";
         version = "1.0.24";
         src = fetchFromGitHub {
           owner = "rbanffy";
@@ -20849,6 +21652,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "grep-context";
+        ename = "grep-context";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -20879,7 +21683,7 @@
           rev = "f541aa22da52";
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/grin";
           sha256 = "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378";
           name = "grin";
@@ -20896,6 +21700,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "grizzl";
+        ename = "grizzl";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "grizzl";
@@ -20923,6 +21728,7 @@
                                   , s }:
       melpaBuild {
         pname = "groovy-imports";
+        ename = "groovy-imports";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "mbezjak";
@@ -20949,6 +21755,7 @@
                                , s }:
       melpaBuild {
         pname = "groovy-mode";
+        ename = "groovy-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
@@ -20973,6 +21780,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "gruber-darker-theme";
+        ename = "gruber-darker-theme";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "rexim";
@@ -20999,6 +21807,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "grunt";
+        ename = "grunt";
         version = "1.3.2";
         src = fetchFromGitHub {
           owner = "gempesaw";
@@ -21024,6 +21833,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "gruvbox-theme";
+        ename = "gruvbox-theme";
         version = "1.26.0";
         src = fetchFromGitHub {
           owner = "Greduan";
@@ -21048,6 +21858,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "gscholar-bibtex";
+        ename = "gscholar-bibtex";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -21073,6 +21884,7 @@
                              , popwin }:
       melpaBuild {
         pname = "guide-key";
+        ename = "guide-key";
         version = "1.2.5";
         src = fetchFromGitHub {
           owner = "kai2nenobu";
@@ -21099,6 +21911,7 @@
                                  , pos-tip }:
       melpaBuild {
         pname = "guide-key-tip";
+        ename = "guide-key-tip";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -21129,6 +21942,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "guix";
+        ename = "guix";
         version = "0.4.1.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -21153,6 +21967,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "guru-mode";
+        ename = "guru-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -21178,6 +21993,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "gxref";
+        ename = "gxref";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "dedi";
@@ -21203,6 +22019,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "hacker-typer";
+        ename = "hacker-typer";
         version = "1.0.6";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
@@ -21228,6 +22045,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "hackernews";
+        ename = "hackernews";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "clarete";
@@ -21254,6 +22072,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ham-mode";
+        ename = "ham-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -21279,6 +22098,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hamburger-menu";
+        ename = "hamburger-menu";
         version = "1.0.5";
         src = fetchFromGitLab {
           owner = "iain";
@@ -21304,6 +22124,7 @@
                              , ruby-mode ? null }:
       melpaBuild {
         pname = "haml-mode";
+        ename = "haml-mode";
         version = "3.1.9";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -21328,6 +22149,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hardcore-mode";
+        ename = "hardcore-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -21353,6 +22175,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hardhat";
+        ename = "hardhat";
         version = "0.4.6";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -21380,6 +22203,7 @@
                            , swiper }:
       melpaBuild {
         pname = "harvest";
+        ename = "harvest";
         version = "0.3.8";
         src = fetchFromGitHub {
           owner = "kostajh";
@@ -21404,6 +22228,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs";
+        ename = "haskell-emacs";
         version = "4.0.3";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -21429,6 +22254,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs-base";
+        ename = "haskell-emacs-base";
         version = "4.0.3";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -21454,6 +22280,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-emacs-text";
+        ename = "haskell-emacs-text";
         version = "4.0.3";
         src = fetchFromGitHub {
           owner = "knupfer";
@@ -21479,6 +22306,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "haskell-mode";
+        ename = "haskell-mode";
         version = "16.1";
         src = fetchFromGitHub {
           owner = "haskell";
@@ -21504,6 +22332,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "haskell-snippets";
+        ename = "haskell-snippets";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "haskell";
@@ -21528,6 +22357,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "haskell-tab-indent";
+        ename = "haskell-tab-indent";
         version = "0.1.0";
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
@@ -21553,6 +22383,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "hasky-extensions";
+        ename = "hasky-extensions";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "hasky-mode";
@@ -21580,6 +22411,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hasky-stack";
+        ename = "hasky-stack";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "hasky-mode";
@@ -21605,6 +22437,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "haxor-mode";
+        ename = "haxor-mode";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
@@ -21630,6 +22463,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "hcl-mode";
+        ename = "hcl-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -21655,6 +22489,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "heaven-and-hell";
+        ename = "heaven-and-hell";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "valignatev";
@@ -21683,6 +22518,7 @@
                         , popup }:
       melpaBuild {
         pname = "helm";
+        ename = "helm";
         version = "2.9.8";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -21709,6 +22545,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ack";
+        ename = "helm-ack";
         version = "0.13";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -21735,6 +22572,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-ag";
+        ename = "helm-ag";
         version = "0.58";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -21760,6 +22598,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-aws";
+        ename = "helm-aws";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
@@ -21787,6 +22626,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-backup";
+        ename = "helm-backup";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "antham";
@@ -21813,6 +22653,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-bbdb";
+        ename = "helm-bbdb";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -21844,6 +22685,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-bibtex";
+        ename = "helm-bibtex";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -21872,6 +22714,7 @@
                            , s }:
       melpaBuild {
         pname = "helm-bm";
+        ename = "helm-bm";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -21897,6 +22740,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-books";
+        ename = "helm-books";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "grugrut";
@@ -21922,6 +22766,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-bundle-show";
+        ename = "helm-bundle-show";
         version = "1.1.5";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -21949,6 +22794,7 @@
                                     , yasnippet }:
       melpaBuild {
         pname = "helm-c-yasnippet";
+        ename = "helm-c-yasnippet";
         version = "0.6.7";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -21976,6 +22822,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-cider";
+        ename = "helm-cider";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -22004,6 +22851,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-circe";
+        ename = "helm-circe";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "lesharris";
@@ -22032,6 +22880,7 @@
                                    , s }:
       melpaBuild {
         pname = "helm-codesearch";
+        ename = "helm-codesearch";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "youngker";
@@ -22060,6 +22909,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-commandlinefu";
+        ename = "helm-commandlinefu";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -22086,6 +22936,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-company";
+        ename = "helm-company";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
@@ -22112,6 +22963,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-core";
+        ename = "helm-core";
         version = "2.9.8";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22140,6 +22992,7 @@
                                , xcscope }:
       melpaBuild {
         pname = "helm-cscope";
+        ename = "helm-cscope";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -22166,6 +23019,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-dash";
+        ename = "helm-dash";
         version = "1.3.0";
         src = fetchFromGitHub {
           owner = "areina";
@@ -22191,6 +23045,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-descbinds";
+        ename = "helm-descbinds";
         version = "1.13";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22217,6 +23072,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "helm-directory";
+        ename = "helm-directory";
         version = "0.6.4";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -22243,6 +23099,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "helm-dired-history";
+        ename = "helm-dired-history";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -22271,6 +23128,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-emms";
+        ename = "helm-emms";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22296,6 +23154,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-etags-plus";
+        ename = "helm-etags-plus";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -22322,6 +23181,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ext";
+        ename = "helm-ext";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -22349,6 +23209,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-firefox";
+        ename = "helm-firefox";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22376,6 +23237,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-flycheck";
+        ename = "helm-flycheck";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -22404,6 +23266,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ghc";
+        ename = "helm-ghc";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -22429,6 +23292,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "helm-ghq";
+        ename = "helm-ghq";
         version = "1.7.0";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -22454,6 +23318,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "helm-git-grep";
+        ename = "helm-git-grep";
         version = "0.10.1";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -22480,12 +23345,13 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-github-stars";
-        version = "1.3.4";
+        ename = "helm-github-stars";
+        version = "1.3.5";
         src = fetchFromGitHub {
           owner = "Sliim";
           repo = "helm-github-stars";
-          rev = "c0ca595e23246165adc12bd85ba7b09760290bc3";
-          sha256 = "0z3nangwhxxhlzd7la9k8gqqxr321iy9z5w6hlvb3f3qgxc84y17";
+          rev = "809cf88e2984b121348b1046e1d3890f1fd580b4";
+          sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars";
@@ -22508,6 +23374,7 @@
                                , s }:
       melpaBuild {
         pname = "helm-gitlab";
+        ename = "helm-gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -22536,6 +23403,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "helm-go-package";
+        ename = "helm-go-package";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -22562,6 +23430,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-gtags";
+        ename = "helm-gtags";
         version = "1.5.6";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -22587,6 +23456,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "helm-hatena-bookmark";
+        ename = "helm-hatena-bookmark";
         version = "2.2.3";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -22614,6 +23484,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-hayoo";
+        ename = "helm-hayoo";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -22639,6 +23510,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-ispell";
+        ename = "helm-ispell";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -22670,7 +23542,7 @@
           rev = "d798bebb1a65e255c8ec791753a0c78e6b19243b";
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
@@ -22688,6 +23560,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-ls-git";
+        ename = "helm-ls-git";
         version = "1.9.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22713,6 +23586,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-ls-hg";
+        ename = "helm-ls-hg";
         version = "1.8.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -22739,6 +23613,7 @@
                              , projectile }:
       melpaBuild {
         pname = "helm-make";
+        ename = "helm-make";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -22766,6 +23641,7 @@
                                , migemo }:
       melpaBuild {
         pname = "helm-migemo";
+        ename = "helm-migemo";
         version = "1.22";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -22791,6 +23667,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-mode-manager";
+        ename = "helm-mode-manager";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
@@ -22819,6 +23696,7 @@
                            , multi-term }:
       melpaBuild {
         pname = "helm-mt";
+        ename = "helm-mt";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "dfdeshom";
@@ -22845,6 +23723,7 @@
                                       , nixos-options }:
       melpaBuild {
         pname = "helm-nixos-options";
+        ename = "helm-nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -22871,6 +23750,7 @@
                                 , notmuch }:
       melpaBuild {
         pname = "helm-notmuch";
+        ename = "helm-notmuch";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -22898,6 +23778,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-open-github";
+        ename = "helm-open-github";
         version = "0.15";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -22927,6 +23808,7 @@
                                   , s }:
       melpaBuild {
         pname = "helm-org-rifle";
+        ename = "helm-org-rifle";
         version = "1.6.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -22952,6 +23834,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-orgcard";
+        ename = "helm-orgcard";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -22979,6 +23862,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-pages";
+        ename = "helm-pages";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -23006,6 +23890,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-perldoc";
+        ename = "helm-perldoc";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23032,6 +23917,7 @@
                                  , perspeen }:
       melpaBuild {
         pname = "helm-perspeen";
+        ename = "helm-perspeen";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "jimo1001";
@@ -23057,6 +23943,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-proc";
+        ename = "helm-proc";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -23083,6 +23970,7 @@
                                         , project-persist }:
       melpaBuild {
         pname = "helm-project-persist";
+        ename = "helm-project-persist";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Sliim";
@@ -23111,6 +23999,7 @@
                                    , projectile }:
       melpaBuild {
         pname = "helm-projectile";
+        ename = "helm-projectile";
         version = "0.14.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -23136,6 +24025,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-pt";
+        ename = "helm-pt";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -23163,6 +24053,7 @@
                                 , window-purpose }:
       melpaBuild {
         pname = "helm-purpose";
+        ename = "helm-purpose";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -23189,6 +24080,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-pydoc";
+        ename = "helm-pydoc";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23214,6 +24106,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-qiita";
+        ename = "helm-qiita";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "masutaka";
@@ -23240,6 +24133,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-rdefs";
+        ename = "helm-rdefs";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "saidie";
@@ -23265,6 +24159,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-recoll";
+        ename = "helm-recoll";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -23293,6 +24188,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "helm-rg";
+        ename = "helm-rg";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -23318,6 +24214,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "helm-robe";
+        ename = "helm-robe";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23344,6 +24241,7 @@
                               , rtags }:
       melpaBuild {
         pname = "helm-rtags";
+        ename = "helm-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -23371,6 +24269,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-rubygems-org";
+        ename = "helm-rubygems-org";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "neomantic";
@@ -23398,6 +24297,7 @@
                              , sage-shell-mode }:
       melpaBuild {
         pname = "helm-sage";
+        ename = "helm-sage";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -23425,6 +24325,7 @@
                              , smex }:
       melpaBuild {
         pname = "helm-smex";
+        ename = "helm-smex";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -23451,6 +24352,7 @@
                                , spaces }:
       melpaBuild {
         pname = "helm-spaces";
+        ename = "helm-spaces";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -23477,6 +24379,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-swoop";
+        ename = "helm-swoop";
         version = "1.7.4";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -23504,6 +24407,7 @@
                                         , seq }:
       melpaBuild {
         pname = "helm-system-packages";
+        ename = "helm-system-packages";
         version = "1.10.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -23529,6 +24433,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "helm-themes";
+        ename = "helm-themes";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -23555,6 +24460,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "helm-tramp";
+        ename = "helm-tramp";
         version = "1.0.5";
         src = fetchFromGitHub {
           owner = "masasam";
@@ -23581,6 +24487,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "helm-unicode";
+        ename = "helm-unicode";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "bomgar";
@@ -23608,6 +24515,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "helm-w32-launcher";
+        ename = "helm-w32-launcher";
         version = "0.1.6";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -23636,6 +24544,7 @@
                             , w3m }:
       melpaBuild {
         pname = "helm-w3m";
+        ename = "helm-w3m";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
@@ -23663,6 +24572,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "helm-zhihu-daily";
+        ename = "helm-zhihu-daily";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -23694,6 +24604,7 @@
                            , shut-up }:
       melpaBuild {
         pname = "helpful";
+        ename = "helpful";
         version = "0.12";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -23718,6 +24629,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hfst-mode";
+        ename = "hfst-mode";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -23742,6 +24654,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "hi2";
+        ename = "hi2";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "nilcons";
@@ -23766,6 +24679,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "hide-lines";
+        ename = "hide-lines";
         version = "20130623.1701";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -23791,6 +24705,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "hide-mode-line";
+        ename = "hide-mode-line";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -23816,6 +24731,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "hierarchy";
+        ename = "hierarchy";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -23841,6 +24757,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-blocks";
+        ename = "highlight-blocks";
         version = "0.1.16";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -23866,6 +24783,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "highlight-defined";
+        ename = "highlight-defined";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -23890,6 +24808,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "highlight-indentation";
+        ename = "highlight-indentation";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "antonj";
@@ -23916,6 +24835,7 @@
                                      , parent-mode }:
       melpaBuild {
         pname = "highlight-numbers";
+        ename = "highlight-numbers";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -23940,6 +24860,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "highlight-parentheses";
+        ename = "highlight-parentheses";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "tsdh";
@@ -23965,6 +24886,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-quoted";
+        ename = "highlight-quoted";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -23989,6 +24911,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "highlight-symbol";
+        ename = "highlight-symbol";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -24014,6 +24937,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hindent";
+        ename = "hindent";
         version = "5.2.6";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -24038,6 +24962,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "hippie-expand-slime";
+        ename = "hippie-expand-slime";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -24062,6 +24987,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "hippie-namespace";
+        ename = "hippie-namespace";
         version = "0.5.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -24087,6 +25013,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "history";
+        ename = "history";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "boyw165";
@@ -24111,6 +25038,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "historyf";
+        ename = "historyf";
         version = "0.0.9";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -24136,6 +25064,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hl-anything";
+        ename = "hl-anything";
         version = "0.0.9";
         src = fetchFromGitHub {
           owner = "hl-anything";
@@ -24160,6 +25089,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "hl-sentence";
+        ename = "hl-sentence";
         version = "3";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -24184,6 +25114,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "hl-todo";
+        ename = "hl-todo";
         version = "1.9.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -24210,6 +25141,7 @@
                                , names }:
       melpaBuild {
         pname = "hoa-pp-mode";
+        ename = "hoa-pp-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "hoaproject";
@@ -24237,6 +25169,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "homebrew-mode";
+        ename = "homebrew-mode";
         version = "1.3.6";
         src = fetchFromGitHub {
           owner = "dunn";
@@ -24263,6 +25196,7 @@
                            , s }:
       melpaBuild {
         pname = "hookify";
+        ename = "hookify";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -24289,6 +25223,7 @@
                          , request }:
       melpaBuild {
         pname = "hound";
+        ename = "hound";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "ryoung786";
@@ -24314,6 +25249,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ht";
+        ename = "ht";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -24338,6 +25274,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "html-to-markdown";
+        ename = "html-to-markdown";
         version = "1.5.1";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -24362,6 +25299,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "htmlize";
+        ename = "htmlize";
         version = "1.53";
         src = fetchFromGitHub {
           owner = "hniksic";
@@ -24386,6 +25324,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "httpcode";
+        ename = "httpcode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "rspivak";
@@ -24413,6 +25352,7 @@
                             , s }:
       melpaBuild {
         pname = "httprepl";
+        ename = "httprepl";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "gregsexton";
@@ -24440,6 +25380,7 @@
                                  , s }:
       melpaBuild {
         pname = "hugsql-ghosts";
+        ename = "hugsql-ghosts";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "rkaercher";
@@ -24464,6 +25405,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "hungry-delete";
+        ename = "hungry-delete";
         version = "1.1.5";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -24492,6 +25434,7 @@
                            , s }:
       melpaBuild {
         pname = "hy-mode";
+        ename = "hy-mode";
         version = "1.0.3";
         src = fetchFromGitHub {
           owner = "hylang";
@@ -24518,6 +25461,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hyai";
+        ename = "hyai";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -24542,6 +25486,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "hydandata-light-theme";
+        ename = "hydandata-light-theme";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "hydandata";
@@ -24566,6 +25511,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "hyde";
+        ename = "hyde";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "nibrahim";
@@ -24591,6 +25537,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "hydra";
+        ename = "hydra";
         version = "0.14.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -24616,6 +25563,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ialign";
+        ename = "ialign";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "mkcms";
@@ -24641,6 +25589,7 @@
                                       , projectile }:
       melpaBuild {
         pname = "ibuffer-projectile";
+        ename = "ibuffer-projectile";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -24665,6 +25614,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-tramp";
+        ename = "ibuffer-tramp";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "svend";
@@ -24690,6 +25640,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ibuffer-vc";
+        ename = "ibuffer-vc";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -24714,6 +25665,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "identica-mode";
+        ename = "identica-mode";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "gabrielsaldana";
@@ -24738,6 +25690,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "idle-highlight-mode";
+        ename = "idle-highlight-mode";
         version = "1.1.3";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -24763,6 +25716,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ido-at-point";
+        ename = "ido-at-point";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "katspaugh";
@@ -24787,6 +25741,7 @@
                                                 , melpaBuild }:
       melpaBuild {
         pname = "ido-complete-space-or-hyphen";
+        ename = "ido-complete-space-or-hyphen";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "doitian";
@@ -24815,6 +25770,7 @@
                                             , s }:
       melpaBuild {
         pname = "ido-completing-read-plus";
+        ename = "ido-completing-read+";
         version = "4.11";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -24840,6 +25796,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "ido-describe-bindings";
+        ename = "ido-describe-bindings";
         version = "0.0.11";
         src = fetchFromGitHub {
           owner = "danil";
@@ -24865,6 +25822,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ido-grid-mode";
+        ename = "ido-grid-mode";
         version = "1.1.5";
         src = fetchFromGitHub {
           owner = "larkery";
@@ -24891,6 +25849,7 @@
                                     , persistent-soft }:
       melpaBuild {
         pname = "ido-load-library";
+        ename = "ido-load-library";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -24916,6 +25875,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ido-occur";
+        ename = "ido-occur";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "danil";
@@ -24940,6 +25900,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ido-vertical-mode";
+        ename = "ido-vertical-mode";
         version = "0.1.6";
         src = fetchFromGitHub {
           owner = "creichert";
@@ -24965,6 +25926,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ido-yes-or-no";
+        ename = "ido-yes-or-no";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -24989,6 +25951,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "idomenu";
+        ename = "idomenu";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "birkenfeld";
@@ -25016,6 +25979,7 @@
                               , prop-menu }:
       melpaBuild {
         pname = "idris-mode";
+        ename = "idris-mode";
         version = "0.9.19";
         src = fetchFromGitHub {
           owner = "idris-hackers";
@@ -25040,6 +26004,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "iedit";
+        ename = "iedit";
         version = "0.9.9.9";
         src = fetchFromGitHub {
           owner = "victorhge";
@@ -25064,6 +26029,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "iflipb";
+        ename = "iflipb";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "jrosdahl";
@@ -25088,6 +26054,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ignoramus";
+        ename = "ignoramus";
         version = "0.7.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -25114,6 +26081,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "image-archive";
+        ename = "image-archive";
         version = "0.0.7";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25139,6 +26107,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "image-dired-plus";
+        ename = "image-dired+";
         version = "0.7.2";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25164,6 +26133,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "image-plus";
+        ename = "image+";
         version = "0.6.2";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -25189,6 +26159,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "imake";
+        ename = "imake";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -25213,6 +26184,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "imapfilter";
+        ename = "imapfilter";
         version = "1.0.3";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -25238,6 +26210,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "imenu-anywhere";
+        ename = "imenu-anywhere";
         version = "1.1.4";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -25263,6 +26236,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "imenu-list";
+        ename = "imenu-list";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -25288,6 +26262,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "imenus";
+        ename = "imenus";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -25312,6 +26287,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "immutant-server";
+        ename = "immutant-server";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "leathekd";
@@ -25339,6 +26315,7 @@
                                   , simple-httpd }:
       melpaBuild {
         pname = "impatient-mode";
+        ename = "impatient-mode";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -25365,6 +26342,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "import-js";
+        ename = "import-js";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "Galooshi";
@@ -25391,6 +26369,7 @@
                                  , popwin }:
       melpaBuild {
         pname = "import-popwin";
+        ename = "import-popwin";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -25418,6 +26397,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "importmagic";
+        ename = "importmagic";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "anachronic";
@@ -25442,6 +26422,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "indent-guide";
+        ename = "indent-guide";
         version = "20160630";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -25471,6 +26452,7 @@
                           , websocket }:
       melpaBuild {
         pname = "indium";
+        ename = "indium";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -25497,6 +26479,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inf-clojure";
+        ename = "inf-clojure";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -25523,6 +26506,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inf-crystal";
+        ename = "inf-crystal";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -25547,6 +26531,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "inf-ruby";
+        ename = "inf-ruby";
         version = "2.5.1";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -25573,6 +26558,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "inflections";
+        ename = "inflections";
         version = "2.5";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -25597,6 +26583,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "info-buffer";
+        ename = "info-buffer";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "llvilanova";
@@ -25622,6 +26609,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "info-colors";
+        ename = "info-colors";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "ubolonton";
@@ -25647,6 +26635,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "inherit-local";
+        ename = "inherit-local";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "shlevy";
@@ -25671,6 +26660,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "init-loader";
+        ename = "init-loader";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -25696,6 +26686,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "init-open-recentf";
+        ename = "init-open-recentf";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -25720,6 +26711,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "initsplit";
+        ename = "initsplit";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "dabrahams";
@@ -25744,6 +26736,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "inline-crypt";
+        ename = "inline-crypt";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
@@ -25768,6 +26761,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "inlineR";
+        ename = "inlineR";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -25792,6 +26786,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "insert-shebang";
+        ename = "insert-shebang";
         version = "0.9.6";
         src = fetchFromGitHub {
           owner = "psachin";
@@ -25822,7 +26817,7 @@
           rev = "8daa0058ede7";
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
@@ -25839,6 +26834,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "intel-hex-mode";
+        ename = "intel-hex-mode";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "mschuldt";
@@ -25863,6 +26859,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "intellij-theme";
+        ename = "intellij-theme";
         version = "1.3";
         src = fetchFromGitLab {
           owner = "fommil";
@@ -25887,6 +26884,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "interleave";
+        ename = "interleave";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -25915,6 +26913,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "intero";
+        ename = "intero";
         version = "0.1.31";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
@@ -25946,7 +26945,7 @@
           rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
           sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
           sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5";
           name = "inverse-acme-theme";
@@ -25963,6 +26962,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "iplayer";
+        ename = "iplayer";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "csrhodes";
@@ -25988,6 +26988,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "ipython-shell-send";
+        ename = "ipython-shell-send";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "jackkamm";
@@ -26012,6 +27013,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ir-black-theme";
+        ename = "ir-black-theme";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "jmdeldin";
@@ -26038,6 +27040,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "irony";
+        ename = "irony";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "Sarcasm";
@@ -26062,6 +27065,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "isgd";
+        ename = "isgd";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -26087,6 +27091,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "iter2";
+        ename = "iter2";
         version = "0.9.7";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -26112,6 +27117,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "ivy";
+        ename = "ivy";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -26143,6 +27149,7 @@
                               , swiper }:
       melpaBuild {
         pname = "ivy-bibtex";
+        ename = "ivy-bibtex";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "tmalsburg";
@@ -26170,6 +27177,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "ivy-dired-history";
+        ename = "ivy-dired-history";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "jixiuf";
@@ -26199,6 +27207,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "ivy-erlang-complete";
+        ename = "ivy-erlang-complete";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
@@ -26223,6 +27232,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ivy-feedwrangler";
+        ename = "ivy-feedwrangler";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "asimpson";
@@ -26251,6 +27261,7 @@
                               , s }:
       melpaBuild {
         pname = "ivy-gitlab";
+        ename = "ivy-gitlab";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -26278,6 +27289,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivy-hydra";
+        ename = "ivy-hydra";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -26306,6 +27318,7 @@
                              , mpdel }:
       melpaBuild {
         pname = "ivy-mpdel";
+        ename = "ivy-mpdel";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -26332,6 +27345,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ivy-pages";
+        ename = "ivy-pages";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "igorepst";
@@ -26359,6 +27373,7 @@
                                  , prescient }:
       melpaBuild {
         pname = "ivy-prescient";
+        ename = "ivy-prescient";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -26386,6 +27401,7 @@
                                , window-purpose }:
       melpaBuild {
         pname = "ivy-purpose";
+        ename = "ivy-purpose";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -26412,6 +27428,7 @@
                              , rtags }:
       melpaBuild {
         pname = "ivy-rtags";
+        ename = "ivy-rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -26439,6 +27456,7 @@
                                , request }:
       melpaBuild {
         pname = "ivy-youtube";
+        ename = "ivy-youtube";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "squiter";
@@ -26464,6 +27482,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ix";
+        ename = "ix";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "theanalyst";
@@ -26488,6 +27507,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "iy-go-to-char";
+        ename = "iy-go-to-char";
         version = "3.2.1";
         src = fetchFromGitHub {
           owner = "doitian";
@@ -26512,6 +27532,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "j-mode";
+        ename = "j-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -26542,7 +27563,7 @@
           rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
           sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
           sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
           name = "jabber";
@@ -26559,6 +27580,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jade-mode";
+        ename = "jade-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -26583,6 +27605,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "jammer";
+        ename = "jammer";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -26607,6 +27630,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "japanlaw";
+        ename = "japanlaw";
         version = "0.9.1";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -26634,6 +27658,7 @@
                                 , s }:
       melpaBuild {
         pname = "java-imports";
+        ename = "java-imports";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "dakrone";
@@ -26659,6 +27684,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "javadoc-lookup";
+        ename = "javadoc-lookup";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -26684,6 +27710,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "jdecomp";
+        ename = "jdecomp";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "xiongtx";
@@ -26711,6 +27738,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jedi";
+        ename = "jedi";
         version = "0.2.7";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -26739,6 +27767,7 @@
                              , python-environment }:
       melpaBuild {
         pname = "jedi-core";
+        ename = "jedi-core";
         version = "0.2.7";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -26766,6 +27795,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "jetbrains";
+        ename = "jetbrains";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -26790,6 +27820,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "jinja2-mode";
+        ename = "jinja2-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "paradoxxxzero";
@@ -26816,6 +27847,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jpop";
+        ename = "jpop";
         version = "3.2.3";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -26841,6 +27873,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "jq-mode";
+        ename = "jq-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "ljos";
@@ -26866,6 +27899,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "js-auto-format-mode";
+        ename = "js-auto-format-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "ybiquitous";
@@ -26891,6 +27925,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "js-comint";
+        ename = "js-comint";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -26916,6 +27951,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "js2-closure";
+        ename = "js2-closure";
         version = "2.2.1";
         src = fetchFromGitHub {
           owner = "jart";
@@ -26941,6 +27977,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "js2-highlight-vars";
+        ename = "js2-highlight-vars";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -26967,6 +28004,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "js2-mode";
+        ename = "js2-mode";
         version = "20180301";
         src = fetchFromGitHub {
           owner = "mooz";
@@ -26996,6 +28034,7 @@
                                 , yasnippet }:
       melpaBuild {
         pname = "js2-refactor";
+        ename = "js2-refactor";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -27020,6 +28059,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "js3-mode";
+        ename = "js3-mode";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "thomblake";
@@ -27044,6 +28084,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "jsfmt";
+        ename = "jsfmt";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "brettlangdon";
@@ -27070,6 +28111,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "json-mode";
+        ename = "json-mode";
         version = "1.7.0";
         src = fetchFromGitHub {
           owner = "joshwnj";
@@ -27096,6 +28138,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "json-navigator";
+        ename = "json-navigator";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -27120,6 +28163,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "json-reformat";
+        ename = "json-reformat";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -27145,6 +28189,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "json-snatcher";
+        ename = "json-snatcher";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Sterlingg";
@@ -27170,6 +28215,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jsonnet-mode";
+        ename = "jsonnet-mode";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "mgyucht";
@@ -27194,6 +28240,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "jsx-mode";
+        ename = "jsx-mode";
         version = "0.1.10";
         src = fetchFromGitHub {
           owner = "jsx";
@@ -27221,6 +28268,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "jump";
+        ename = "jump";
         version = "2.5";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -27245,6 +28293,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "jump-to-line";
+        ename = "jump-to-line";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -27271,6 +28320,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "jvm-mode";
+        ename = "jvm-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "martintrojer";
@@ -27296,6 +28346,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "kaesar";
+        ename = "kaesar";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -27321,6 +28372,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kaesar-file";
+        ename = "kaesar-file";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -27347,6 +28399,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kaesar-mode";
+        ename = "kaesar-mode";
         version = "0.9.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -27372,6 +28425,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "kakapo-mode";
+        ename = "kakapo-mode";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "listx";
@@ -27399,6 +28453,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "kaolin-themes";
+        ename = "kaolin-themes";
         version = "1.3.5";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
@@ -27423,6 +28478,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "karma";
+        ename = "karma";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -27447,6 +28503,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "key-chord";
+        ename = "key-chord";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -27471,6 +28528,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "key-combo";
+        ename = "key-combo";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "uk-ar";
@@ -27496,6 +28554,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "key-seq";
+        ename = "key-seq";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "vlevit";
@@ -27521,6 +28580,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "keycast";
+        ename = "keycast";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -27545,6 +28605,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "keychain-environment";
+        ename = "keychain-environment";
         version = "2.4.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -27569,6 +28630,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "keydef";
+        ename = "keydef";
         version = "1.15";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -27593,6 +28655,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "keyfreq";
+        ename = "keyfreq";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "dacap";
@@ -27618,6 +28681,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "keymap-utils";
+        ename = "keymap-utils";
         version = "3.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -27644,6 +28708,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "keyset";
+        ename = "keyset";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -27670,6 +28735,7 @@
                                 , s }:
       melpaBuild {
         pname = "kibit-helper";
+        ename = "kibit-helper";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "brunchboy";
@@ -27696,6 +28762,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "kill-or-bury-alive";
+        ename = "kill-or-bury-alive";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -27720,6 +28787,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "kill-ring-search";
+        ename = "kill-ring-search";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -27744,6 +28812,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "killer";
+        ename = "killer";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -27768,6 +28837,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "kivy-mode";
+        ename = "kivy-mode";
         version = "1.10.1";
         src = fetchFromGitHub {
           owner = "kivy";
@@ -27794,6 +28864,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "kiwix";
+        ename = "kiwix";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "stardiviner";
@@ -27818,6 +28889,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "know-your-http-well";
+        ename = "know-your-http-well";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "for-GET";
@@ -27843,6 +28915,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ksp-cfg-mode";
+        ename = "ksp-cfg-mode";
         version = "0.5.1";
         src = fetchFromGitHub {
           owner = "lashtear";
@@ -27870,6 +28943,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "kubernetes";
+        ename = "kubernetes";
         version = "0.12.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -27896,6 +28970,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "kubernetes-evil";
+        ename = "kubernetes-evil";
         version = "0.12.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -27922,6 +28997,7 @@
                              , s }:
       melpaBuild {
         pname = "kurecolor";
+        ename = "kurecolor";
         version = "1.2.6";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -27946,6 +29022,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "labburn-theme";
+        ename = "labburn-theme";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ksjogo";
@@ -27971,6 +29048,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "langtool";
+        ename = "langtool";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -27997,6 +29075,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "latex-extra";
+        ename = "latex-extra";
         version = "1.14";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -28021,6 +29100,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "latex-math-preview";
+        ename = "latex-math-preview";
         version = "0.7.2";
         src = fetchFromGitLab {
           owner = "latex-math-preview";
@@ -28045,6 +29125,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "latex-unicode-math-mode";
+        ename = "latex-unicode-math-mode";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "Christoph-D";
@@ -28070,6 +29151,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lcb-mode";
+        ename = "lcb-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "peter-b";
@@ -28096,6 +29178,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "lcr";
+        ename = "lcr";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "jyp";
@@ -28127,6 +29210,7 @@
                            , s }:
       melpaBuild {
         pname = "leanote";
+        ename = "leanote";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "aborn";
@@ -28151,6 +29235,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "ledger-mode";
+        ename = "ledger-mode";
         version = "3.1.1";
         src = fetchFromGitHub {
           owner = "ledger";
@@ -28180,6 +29265,7 @@
                           , s }:
       melpaBuild {
         pname = "lentic";
+        ename = "lentic";
         version = "0.11";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -28204,6 +29290,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "less-css-mode";
+        ename = "less-css-mode";
         version = "0.21";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -28228,6 +29315,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "letcheck";
+        ename = "letcheck";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -28252,6 +29340,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lfe-mode";
+        ename = "lfe-mode";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "rvirding";
@@ -28278,6 +29367,7 @@
                               , request }:
       melpaBuild {
         pname = "libelcouch";
+        ename = "libelcouch";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -28303,6 +29393,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "libmpdel";
+        ename = "libmpdel";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -28327,6 +29418,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "lice";
+        ename = "lice";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "buzztaiki";
@@ -28351,6 +29443,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "line-up-words";
+        ename = "line-up-words";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "janestreet";
@@ -28375,6 +29468,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "lingr";
+        ename = "lingr";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "lugecy";
@@ -28399,6 +29493,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "link";
+        ename = "link";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "myrkr";
@@ -28430,7 +29525,7 @@
           rev = "d26b5330e6e42b4bed4e4730054b4c5e308ceab2";
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
@@ -28447,6 +29542,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "linum-relative";
+        ename = "linum-relative";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -28477,6 +29573,7 @@
                          , swiper }:
       melpaBuild {
         pname = "lispy";
+        ename = "lispy";
         version = "0.26.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -28508,6 +29605,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "lispyscript-mode";
+        ename = "lispyscript-mode";
         version = "0.3.5";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -28535,6 +29633,7 @@
                                      , s }:
       melpaBuild {
         pname = "list-packages-ext";
+        ename = "list-packages-ext";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -28560,6 +29659,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "list-unicode-display";
+        ename = "list-unicode-display";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -28584,6 +29684,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "list-utils";
+        ename = "list-utils";
         version = "0.4.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -28608,6 +29709,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lit-mode";
+        ename = "lit-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "HectorAE";
@@ -28634,6 +29736,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "literal-string";
+        ename = "literal-string";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "joodie";
@@ -28659,6 +29762,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "literate-coffee-mode";
+        ename = "literate-coffee-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -28686,6 +29790,7 @@
                                    , narrowed-page-navigation }:
       melpaBuild {
         pname = "live-code-talks";
+        ename = "live-code-talks";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -28711,6 +29816,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "live-py-mode";
+        ename = "live-py-mode";
         version = "2.22.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
@@ -28735,6 +29841,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "lively";
+        ename = "lively";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -28766,7 +29873,7 @@
           rev = "f07ac3678e27";
           sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
           sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
           name = "lms";
@@ -28783,6 +29890,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "load-relative";
+        ename = "load-relative";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -28807,6 +29915,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "loc-changes";
+        ename = "loc-changes";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -28831,6 +29940,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "log4e";
+        ename = "log4e";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -28855,6 +29965,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "logalimacs";
+        ename = "logalimacs";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "logaling";
@@ -28880,6 +29991,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "logito";
+        ename = "logito";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -28906,6 +30018,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "logview";
+        ename = "logview";
         version = "0.11.1";
         src = fetchFromGitHub {
           owner = "doublep";
@@ -28930,6 +30043,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "loop";
+        ename = "loop";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -28955,6 +30069,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "love-minor-mode";
+        ename = "love-minor-mode";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -28980,6 +30095,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-mode";
+        ename = "lsp-mode";
         version = "4.2";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -29006,6 +30122,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "lsp-ocaml";
+        ename = "lsp-ocaml";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
@@ -29030,6 +30147,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "lua-mode";
+        ename = "lua-mode";
         version = "20151025";
         src = fetchFromGitHub {
           owner = "immerrr";
@@ -29054,6 +30172,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "lusty-explorer";
+        ename = "lusty-explorer";
         version = "3.0";
         src = fetchFromGitHub {
           owner = "sjbach";
@@ -29078,6 +30197,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "lv";
+        ename = "lv";
         version = "0.14.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -29104,6 +30224,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "lxc-tramp";
+        ename = "lxc-tramp";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "montag451";
@@ -29129,6 +30250,7 @@
                             , seq }:
       melpaBuild {
         pname = "m-buffer";
+        ename = "m-buffer";
         version = "0.15";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -29154,6 +30276,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "mac-pseudo-daemon";
+        ename = "mac-pseudo-daemon";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -29178,6 +30301,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "macro-math";
+        ename = "macro-math";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -29203,6 +30327,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "macrostep";
+        ename = "macrostep";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -29229,6 +30354,7 @@
                                   , s }:
       melpaBuild {
         pname = "magic-filetype";
+        ename = "magic-filetype";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -29261,6 +30387,7 @@
                          , with-editor }:
       melpaBuild {
         pname = "magit";
+        ename = "magit";
         version = "2.13.0";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29296,6 +30423,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-annex";
+        ename = "magit-annex";
         version = "1.6.0";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29322,6 +30450,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "magit-filenotify";
+        ename = "magit-filenotify";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "ruediger";
@@ -29348,6 +30477,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "magit-find-file";
+        ename = "magit-find-file";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "bradwright";
@@ -29373,6 +30503,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-gerrit";
+        ename = "magit-gerrit";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "terranpro";
@@ -29402,6 +30533,7 @@
                                   , s }:
       melpaBuild {
         pname = "magit-gh-pulls";
+        ename = "magit-gh-pulls";
         version = "0.5.3";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -29428,6 +30560,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "magit-gitflow";
+        ename = "magit-gitflow";
         version = "2.2.3";
         src = fetchFromGitHub {
           owner = "jtatarik";
@@ -29454,6 +30587,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-imerge";
+        ename = "magit-imerge";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29480,6 +30614,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "magit-org-todos";
+        ename = "magit-org-todos";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "danielma";
@@ -29507,6 +30642,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-popup";
+        ename = "magit-popup";
         version = "2.12.3";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29533,6 +30669,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "magit-stgit";
+        ename = "magit-stgit";
         version = "2.1.3";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29559,6 +30696,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "magit-svn";
+        ename = "magit-svn";
         version = "2.2.1";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29585,6 +30723,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-tbdiff";
+        ename = "magit-tbdiff";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29619,12 +30758,13 @@
                                , s }:
       melpaBuild {
         pname = "magit-todos";
-        version = "1.0.2";
+        ename = "magit-todos";
+        version = "1.0.3";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "204e163d941dcc3b89db8a462d73e3c69e8e83bc";
-          sha256 = "1v78rzgk9s3ww97smqryyr3f2np5zwxx0j7v79rwmy49ck2n3cvq";
+          rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63";
+          sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
@@ -29656,6 +30796,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "magit-topgit";
+        ename = "magit-topgit";
         version = "2.1.2";
         src = fetchFromGitHub {
           owner = "magit";
@@ -29686,6 +30827,7 @@
                             , s }:
       melpaBuild {
         pname = "magithub";
+        ename = "magithub";
         version = "0.1.7";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -29710,6 +30852,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "make-color";
+        ename = "make-color";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -29735,6 +30878,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "makey";
+        ename = "makey";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -29765,6 +30909,7 @@
                            , s }:
       melpaBuild {
         pname = "malinka";
+        ename = "malinka";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "LefterisJP";
@@ -29789,6 +30934,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "mallard-mode";
+        ename = "mallard-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "jhradilek";
@@ -29813,6 +30959,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "map-progress";
+        ename = "map-progress";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -29838,6 +30985,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "map-regexp";
+        ename = "map-regexp";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -29866,6 +31014,7 @@
                              , s }:
       melpaBuild {
         pname = "marcopolo";
+        ename = "marcopolo";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -29890,6 +31039,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "mark-tools";
+        ename = "mark-tools";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "stsquad";
@@ -29916,6 +31066,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "markdown-mode";
+        ename = "markdown-mode";
         version = "2.3";
         src = fetchFromGitHub {
           owner = "jrblevin";
@@ -29941,6 +31092,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "markdown-mode-plus";
+        ename = "markdown-mode+";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -29971,6 +31123,7 @@
                                          , websocket }:
       melpaBuild {
         pname = "markdown-preview-mode";
+        ename = "markdown-preview-mode";
         version = "0.9";
         src = fetchFromGitHub {
           owner = "ancane";
@@ -30005,6 +31158,7 @@
                                 , s }:
       melpaBuild {
         pname = "markdown-toc";
+        ename = "markdown-toc";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -30030,6 +31184,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "markup";
+        ename = "markup";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -30054,6 +31209,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "markup-faces";
+        ename = "markup-faces";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "sensorflo";
@@ -30081,6 +31237,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "marshal";
+        ename = "marshal";
         version = "0.8.2";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -30106,6 +31263,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "mastodon";
+        ename = "mastodon";
         version = "0.7.2";
         src = fetchFromGitHub {
           owner = "jdenen";
@@ -30131,6 +31289,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "material-theme";
+        ename = "material-theme";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "cpaulik";
@@ -30155,6 +31314,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "math-symbol-lists";
+        ename = "math-symbol-lists";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -30181,6 +31341,7 @@
                                    , s }:
       melpaBuild {
         pname = "maven-test-mode";
+        ename = "maven-test-mode";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "rranelli";
@@ -30205,6 +31366,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "maxframe";
+        ename = "maxframe";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "rmm5t";
@@ -30230,6 +31392,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mb-url";
+        ename = "mb-url";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "dochang";
@@ -30256,6 +31419,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mbe";
+        ename = "mbe";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "ijp";
@@ -30281,6 +31445,7 @@
                              , multiple-cursors }:
       melpaBuild {
         pname = "mc-extras";
+        ename = "mc-extras";
         version = "1.2.4";
         src = fetchFromGitHub {
           owner = "knu";
@@ -30305,6 +31470,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mediawiki";
+        ename = "mediawiki";
         version = "2.2.9";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -30333,12 +31499,13 @@
                              , yasnippet }:
       melpaBuild {
         pname = "meghanada";
-        version = "1.0.7";
+        ename = "meghanada";
+        version = "1.0.8";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "f55a237e10fac1f06b50a41c54236ed9fc197530";
-          sha256 = "17shp56xg47sfp9l1iak5dscr62yj9i55xwnfn380x24pxrsfp88";
+          rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c";
+          sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -30358,6 +31525,7 @@
                                         , s }:
       melpaBuild {
         pname = "melpa-upstream-visit";
+        ename = "melpa-upstream-visit";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "laynor";
@@ -30382,6 +31550,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "memoize";
+        ename = "memoize";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -30409,6 +31578,7 @@
                           , xml-rpc }:
       melpaBuild {
         pname = "mentor";
+        ename = "mentor";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "skangas";
@@ -30433,6 +31603,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "merlin";
+        ename = "merlin";
         version = "3.1.0";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
@@ -30458,6 +31629,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "merlin-eldoc";
+        ename = "merlin-eldoc";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "khady";
@@ -30483,6 +31655,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "meson-mode";
+        ename = "meson-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "wentasah";
@@ -30507,6 +31680,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "meta-presenter";
+        ename = "meta-presenter";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -30532,6 +31706,7 @@
                               , xml-rpc }:
       melpaBuild {
         pname = "metaweblog";
+        ename = "metaweblog";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "punchagan";
@@ -30556,6 +31731,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mew";
+        ename = "mew";
         version = "6.8";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
@@ -30581,6 +31757,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "mgmtconfig-mode";
+        ename = "mgmtconfig-mode";
         version = "0.0.15";
         src = fetchFromGitHub {
           owner = "purpleidea";
@@ -30606,12 +31783,13 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mhc";
-        version = "1.1.1";
+        ename = "mhc";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "46d2a983b77b3139c9694ffba16ae875edc7d5b0";
-          sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
+          rev = "e29e69ab2f282131039a63f56f48e39d56c175d9";
+          sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -30630,6 +31808,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "migemo";
+        ename = "migemo";
         version = "1.9.1";
         src = fetchFromGitHub {
           owner = "emacs-jp";
@@ -30654,6 +31833,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "milkode";
+        ename = "milkode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -30678,6 +31858,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "minibuffer-complete-cycle";
+        ename = "minibuffer-complete-cycle";
         version = "1.25.20130814";
         src = fetchFromGitHub {
           owner = "knu";
@@ -30702,6 +31883,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "minibuffer-cua";
+        ename = "minibuffer-cua";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "knu";
@@ -30726,6 +31908,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "miniedit";
+        ename = "miniedit";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -30750,6 +31933,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "minimal-session-saver";
+        ename = "minimal-session-saver";
         version = "0.6.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -30776,6 +31960,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "minions";
+        ename = "minions";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -30801,6 +31986,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "minitest";
+        ename = "minitest";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "arthurnn";
@@ -30825,6 +32011,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mips-mode";
+        ename = "mips-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -30850,6 +32037,7 @@
                               , mmm-mode }:
       melpaBuild {
         pname = "mmm-jinja2";
+        ename = "mmm-jinja2";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "glynnforrest";
@@ -30881,7 +32069,7 @@
           rev = "5c9ff92137b5";
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
@@ -30900,6 +32088,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "mmt";
+        ename = "mmt";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -30925,6 +32114,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mocha";
+        ename = "mocha";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "scottaj";
@@ -30950,6 +32140,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "mocha-snippets";
+        ename = "mocha-snippets";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "cowboyd";
@@ -30976,6 +32167,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "mocker";
+        ename = "mocker";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -31001,6 +32193,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "modalka";
+        ename = "modalka";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -31027,6 +32220,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "mode-icons";
+        ename = "mode-icons";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -31051,6 +32245,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "mode-line-debug";
+        ename = "mode-line-debug";
         version = "1.2.3";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -31075,6 +32270,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "modern-cpp-font-lock";
+        ename = "modern-cpp-font-lock";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
@@ -31099,6 +32295,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "moe-theme";
+        ename = "moe-theme";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -31124,6 +32321,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "monitor";
+        ename = "monitor";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -31148,6 +32346,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "monokai-theme";
+        ename = "monokai-theme";
         version = "3.5.3";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
@@ -31172,6 +32371,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "monroe";
+        ename = "monroe";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "sanel";
@@ -31197,6 +32397,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "moody";
+        ename = "moody";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -31222,6 +32423,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "moom";
+        ename = "moom";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "takaxp";
@@ -31246,6 +32448,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "morlock";
+        ename = "morlock";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -31271,6 +32474,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mosey";
+        ename = "mosey";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -31295,6 +32499,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "move-dup";
+        ename = "move-dup";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "wyuenho";
@@ -31319,6 +32524,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "move-text";
+        ename = "move-text";
         version = "2.0.8";
         src = fetchFromGitHub {
           owner = "emacsfodder";
@@ -31343,6 +32549,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mowedline";
+        ename = "mowedline";
         version = "3.3.0";
         src = fetchFromGitHub {
           owner = "retroj";
@@ -31367,6 +32574,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "moz";
+        ename = "moz";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "bard";
@@ -31392,6 +32600,7 @@
                                   , moz }:
       melpaBuild {
         pname = "moz-controller";
+        ename = "moz-controller";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "RenWenshan";
@@ -31419,6 +32628,7 @@
                              , mozc }:
       melpaBuild {
         pname = "mozc-temp";
+        ename = "mozc-temp";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "HKey";
@@ -31445,6 +32655,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mpdel";
+        ename = "mpdel";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "mpdel";
@@ -31471,6 +32682,7 @@
                               , queue }:
       melpaBuild {
         pname = "mpmc-queue";
+        ename = "mpmc-queue";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "smizoe";
@@ -31500,6 +32712,7 @@
                        , org }:
       melpaBuild {
         pname = "mpv";
+        ename = "mpv";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "kljohann";
@@ -31526,6 +32739,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "mqtt-mode";
+        ename = "mqtt-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -31554,6 +32768,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "msvc";
+        ename = "msvc";
         version = "1.3.7";
         src = fetchFromGitHub {
           owner = "yaruopooner";
@@ -31579,6 +32794,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mtg-deck-mode";
+        ename = "mtg-deck-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "mattiasb";
@@ -31607,6 +32823,7 @@
                               , s }:
       melpaBuild {
         pname = "mu4e-alert";
+        ename = "mu4e-alert";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -31631,6 +32848,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "mu4e-maildirs-extension";
+        ename = "mu4e-maildirs-extension";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "agpchil";
@@ -31656,6 +32874,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "multi";
+        ename = "multi";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
@@ -31685,6 +32904,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "multi-line";
+        ename = "multi-line";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -31716,7 +32936,7 @@
           rev = "a6e7c1542c0b";
           sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
@@ -31735,6 +32955,7 @@
                              , window-layout }:
       melpaBuild {
         pname = "multi-run";
+        ename = "multi-run";
         version = "1";
         src = fetchFromGitHub {
           owner = "sagarjha";
@@ -31759,6 +32980,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "multi-term";
+        ename = "multi-term";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -31783,6 +33005,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "multi-web-mode";
+        ename = "multi-web-mode";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "fgallina";
@@ -31808,6 +33031,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "multiple-cursors";
+        ename = "multiple-cursors";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -31835,6 +33059,7 @@
                             , s }:
       melpaBuild {
         pname = "mustache";
+        ename = "mustache";
         version = "0.23";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -31859,6 +33084,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "mustache-mode";
+        ename = "mustache-mode";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "mustache";
@@ -31883,6 +33109,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "mwim";
+        ename = "mwim";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -31909,6 +33136,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "mykie";
+        ename = "mykie";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "yuutayamada";
@@ -31935,6 +33163,7 @@
                                 , s }:
       melpaBuild {
         pname = "mysql-to-org";
+        ename = "mysql-to-org";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "mallt";
@@ -31961,6 +33190,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "myterminal-controls";
+        ename = "myterminal-controls";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -31988,6 +33218,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "name-this-color";
+        ename = "name-this-color";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "knl";
@@ -32013,6 +33244,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nameless";
+        ename = "nameless";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -32039,6 +33271,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "names";
+        ename = "names";
         version = "20151201.0";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -32064,6 +33297,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "narrow-reindent";
+        ename = "narrow-reindent";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "emallson";
@@ -32090,6 +33324,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "narrowed-page-navigation";
+        ename = "narrowed-page-navigation";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -32115,6 +33350,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nasm-mode";
+        ename = "nasm-mode";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -32139,6 +33375,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nav-flash";
+        ename = "nav-flash";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -32163,6 +33400,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "navi-mode";
+        ename = "navi-mode";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -32190,6 +33428,7 @@
                             , s }:
       melpaBuild {
         pname = "navorski";
+        ename = "navorski";
         version = "0.2.7";
         src = fetchFromGitHub {
           owner = "roman";
@@ -32215,6 +33454,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ncl-mode";
+        ename = "ncl-mode";
         version = "0.99.2";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -32239,6 +33479,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "nemerle";
+        ename = "nemerle";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "rsdn";
@@ -32263,6 +33504,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "neon-mode";
+        ename = "neon-mode";
         version = "1.3.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -32288,6 +33530,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "neotree";
+        ename = "neotree";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "jaypei";
@@ -32312,6 +33555,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "netease-music";
+        ename = "netease-music";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "nicehiro";
@@ -32336,6 +33580,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nginx-mode";
+        ename = "nginx-mode";
         version = "1.1.9";
         src = fetchFromGitHub {
           owner = "ajc";
@@ -32360,6 +33605,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "niceify-info";
+        ename = "niceify-info";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -32385,6 +33631,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "night-owl-theme";
+        ename = "night-owl-theme";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "aaronjensen";
@@ -32414,6 +33661,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nim-mode";
+        ename = "nim-mode";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "nim-lang";
@@ -32439,6 +33687,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ninja-mode";
+        ename = "ninja-mode";
         version = "1.8.2";
         src = fetchFromGitHub {
           owner = "martine";
@@ -32465,6 +33714,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nix-buffer";
+        ename = "nix-buffer";
         version = "3.1.1";
         src = fetchFromGitHub {
           owner = "shlevy";
@@ -32490,6 +33740,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "nix-mode";
+        ename = "nix-mode";
         version = "1.2.2";
         src = fetchFromGitHub {
           owner = "NixOS";
@@ -32516,6 +33767,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "nixos-options";
+        ename = "nixos-options";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
@@ -32541,6 +33793,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "no-littering";
+        ename = "no-littering";
         version = "0.5.14";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -32565,6 +33818,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "noccur";
+        ename = "noccur";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -32589,6 +33843,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "nodejs-repl";
+        ename = "nodejs-repl";
         version = "0.1.6";
         src = fetchFromGitHub {
           owner = "abicky";
@@ -32614,6 +33869,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "nodemcu-mode";
+        ename = "nodemcu-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -32639,6 +33895,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "nofrils-acme-theme";
+        ename = "nofrils-acme-theme";
         version = "0.1.0";
         src = fetchFromGitLab {
           owner = "esessoms";
@@ -32664,6 +33921,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nord-theme";
+        ename = "nord-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
@@ -32694,7 +33952,7 @@
           rev = "194d7789bf79";
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nose";
           sha256 = "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682";
           name = "nose";
@@ -32711,6 +33969,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "notmuch";
+        ename = "notmuch";
         version = "0.27";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
@@ -32735,6 +33994,7 @@
                                    , notmuch }:
       melpaBuild {
         pname = "notmuch-labeler";
+        ename = "notmuch-labeler";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -32762,6 +34022,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "nov";
+        ename = "nov";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -32786,6 +34047,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "noxml-fold";
+        ename = "noxml-fold";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "paddymcall";
@@ -32811,6 +34073,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "npm-mode";
+        ename = "npm-mode";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "mojochao";
@@ -32836,6 +34099,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "nrepl-sync";
+        ename = "nrepl-sync";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -32860,6 +34124,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nsis-mode";
+        ename = "nsis-mode";
         version = "0.44";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -32884,6 +34149,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "number-lock";
+        ename = "number-lock";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Liu233w";
@@ -32909,6 +34175,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "numbers";
+        ename = "numbers";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "davep";
@@ -32937,6 +34204,7 @@
                        , s }:
       melpaBuild {
         pname = "nvm";
+        ename = "nvm";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -32961,6 +34229,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "nyan-mode";
+        ename = "nyan-mode";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "TeMPOraL";
@@ -32985,6 +34254,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "o-blog";
+        ename = "o-blog";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "renard";
@@ -33013,6 +34283,7 @@
                             , org }:
       melpaBuild {
         pname = "ob-async";
+        ename = "ob-async";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "astahlman";
@@ -33037,6 +34308,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ob-blockdiag";
+        ename = "ob-blockdiag";
         version = "20170728.113";
         src = fetchFromGitHub {
           owner = "corpix";
@@ -33061,6 +34333,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "ob-coffeescript";
+        ename = "ob-coffeescript";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -33087,6 +34360,7 @@
                            , s }:
       melpaBuild {
         pname = "ob-http";
+        ename = "ob-http";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "zweifisch";
@@ -33112,6 +34386,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "ob-hy";
+        ename = "ob-hy";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "brantou";
@@ -33136,6 +34411,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ob-prolog";
+        ename = "ob-prolog";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "ljos";
@@ -33163,6 +34439,7 @@
                                , sage-shell-mode }:
       melpaBuild {
         pname = "ob-sagemath";
+        ename = "ob-sagemath";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "stakemori";
@@ -33188,6 +34465,7 @@
                           , sml-mode }:
       melpaBuild {
         pname = "ob-sml";
+        ename = "ob-sml";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "swannodette";
@@ -33214,6 +34492,7 @@
                                 , org }:
       melpaBuild {
         pname = "ob-translate";
+        ename = "ob-translate";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -33238,6 +34517,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ob-uart";
+        ename = "ob-uart";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -33263,6 +34543,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "obfusurl";
+        ename = "obfusurl";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "davep";
@@ -33288,6 +34569,7 @@
                                        , svg-mode-line-themes }:
       melpaBuild {
         pname = "ocodo-svg-modelines";
+        ename = "ocodo-svg-modelines";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "ocodo";
@@ -33312,6 +34594,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ocp-indent";
+        ename = "ocp-indent";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "OCamlPro";
@@ -33337,6 +34620,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "octicons";
+        ename = "octicons";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -33361,6 +34645,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "offlineimap";
+        ename = "offlineimap";
         version = "1";
         src = fetchFromGitHub {
           owner = "jd";
@@ -33386,6 +34671,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "olivetti";
+        ename = "olivetti";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -33410,6 +34696,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "omni-kill";
+        ename = "omni-kill";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -33438,6 +34725,7 @@
                             , s }:
       melpaBuild {
         pname = "omni-log";
+        ename = "omni-log";
         version = "0.3.6";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -33467,6 +34755,7 @@
                                , s }:
       melpaBuild {
         pname = "omni-quotes";
+        ename = "omni-quotes";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -33491,6 +34780,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "omni-scratch";
+        ename = "omni-scratch";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -33517,6 +34807,7 @@
                              , pcre2el }:
       melpaBuild {
         pname = "omni-tags";
+        ename = "omni-tags";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "AdrieanKhisbe";
@@ -33551,6 +34842,7 @@
                              , shut-up }:
       melpaBuild {
         pname = "omnisharp";
+        ename = "omnisharp";
         version = "4.2";
         src = fetchFromGitHub {
           owner = "OmniSharp";
@@ -33587,6 +34879,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "opam";
+        ename = "opam";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -33611,6 +34904,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "opencl-mode";
+        ename = "opencl-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "salmanebah";
@@ -33638,6 +34932,7 @@
                           , request }:
       melpaBuild {
         pname = "opener";
+        ename = "opener";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "0robustus1";
@@ -33666,6 +34961,7 @@
                               , s }:
       melpaBuild {
         pname = "opensource";
+        ename = "opensource";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "OpenSourceOrg";
@@ -33690,6 +34986,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "operate-on-number";
+        ename = "operate-on-number";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "knu";
@@ -33717,6 +35014,7 @@
                           , yaxception }:
       melpaBuild {
         pname = "org-ac";
+        ename = "org-ac";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -33742,6 +35040,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "org-agenda-property";
+        ename = "org-agenda-property";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -33769,6 +35068,7 @@
                              , s }:
       melpaBuild {
         pname = "org-alert";
+        ename = "org-alert";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "groksteve";
@@ -33793,6 +35093,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-autolist";
+        ename = "org-autolist";
         version = "0.14";
         src = fetchFromGitHub {
           owner = "calvinwyoung";
@@ -33821,6 +35122,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "org-babel-eval-in-repl";
+        ename = "org-babel-eval-in-repl";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "diadochos";
@@ -33845,6 +35147,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "org-beautify-theme";
+        ename = "org-beautify-theme";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "jonnay";
@@ -33869,6 +35172,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-board";
+        ename = "org-board";
         version = "1018";
         src = fetchFromGitHub {
           owner = "scallywag";
@@ -33894,6 +35198,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "org-bookmark-heading";
+        ename = "org-bookmark-heading";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -33918,6 +35223,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-bullets";
+        ename = "org-bullets";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -33944,6 +35250,7 @@
                                         , org }:
       melpaBuild {
         pname = "org-category-capture";
+        ename = "org-category-capture";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -33970,6 +35277,7 @@
                                  , s }:
       melpaBuild {
         pname = "org-clock-csv";
+        ename = "org-clock-csv";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "atheriel";
@@ -33997,6 +35305,7 @@
                                   , org }:
       melpaBuild {
         pname = "org-commentary";
+        ename = "org-commentary";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "smaximov";
@@ -34021,6 +35330,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-doing";
+        ename = "org-doing";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -34046,6 +35356,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-download";
+        ename = "org-download";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -34071,6 +35382,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "org-dp";
+        ename = "org-dp";
         version = "1";
         src = fetchFromGitHub {
           owner = "tj64";
@@ -34097,6 +35409,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-edit-latex";
+        ename = "org-edit-latex";
         version = "0.8.3";
         src = fetchFromGitHub {
           owner = "et2010";
@@ -34123,6 +35436,7 @@
                                   , org }:
       melpaBuild {
         pname = "org-elisp-help";
+        ename = "org-elisp-help";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -34151,6 +35465,7 @@
                             , org }:
       melpaBuild {
         pname = "org-evil";
+        ename = "org-evil";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
@@ -34180,6 +35495,7 @@
                             , request-deferred }:
       melpaBuild {
         pname = "org-gcal";
+        ename = "org-gcal";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -34207,6 +35523,7 @@
                              , telepathy }:
       melpaBuild {
         pname = "org-gnome";
+        ename = "org-gnome";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -34231,6 +35548,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "org-if";
+        ename = "org-if";
         version = "0.2.0";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -34256,6 +35574,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-index";
+        ename = "org-index";
         version = "5.8.9";
         src = fetchFromGitHub {
           owner = "marcihm";
@@ -34284,6 +35603,7 @@
                             , s }:
       melpaBuild {
         pname = "org-jira";
+        ename = "org-jira";
         version = "3.1.1";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -34309,6 +35629,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-journal";
+        ename = "org-journal";
         version = "1.14.2";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -34332,22 +35653,24 @@
                               , fetchFromGitHub
                               , fetchurl
                               , lib
-                              , melpaBuild }:
+                              , melpaBuild
+                              , org }:
       melpaBuild {
         pname = "org-kanban";
-        version = "0.4.3";
+        ename = "org-kanban";
+        version = "0.4.6";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "e391db5c4db31b23d542fe31b4e93a7fc8712d86";
-          sha256 = "0m987admsxy8wpiylwd4cagpzn4yg1b3p0z77ksw2zgz0ykfnx5s";
+          rev = "84c9e429ec9fcbe8d6091f15545ee7ebfc1cb589";
+          sha256 = "1jpl56mpw0l2camknzcpng6ji4yb6gz2g29i019iprz9cik5g0xm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
           sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41";
           name = "recipe";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ dash emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-kanban";
           license = lib.licenses.free;
@@ -34360,6 +35683,7 @@
                                    , org }:
       melpaBuild {
         pname = "org-link-travis";
+        ename = "org-link-travis";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -34386,6 +35710,7 @@
                                , yaxception }:
       melpaBuild {
         pname = "org-linkany";
+        ename = "org-linkany";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -34414,6 +35739,7 @@
                                 , s }:
       melpaBuild {
         pname = "org-make-toc";
+        ename = "org-make-toc";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -34440,6 +35766,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "org-mime";
+        ename = "org-mime";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "org-mime";
@@ -34465,6 +35792,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-mru-clock";
+        ename = "org-mru-clock";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -34492,6 +35820,7 @@
                                        , org }:
       melpaBuild {
         pname = "org-multiple-keymap";
+        ename = "org-multiple-keymap";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -34519,6 +35848,7 @@
                              , org }:
       melpaBuild {
         pname = "org-noter";
+        ename = "org-noter";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "weirdNox";
@@ -34543,6 +35873,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "org-outlook";
+        ename = "org-outlook";
         version = "0.11";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -34571,6 +35902,7 @@
                             , org }:
       melpaBuild {
         pname = "org-page";
+        ename = "org-page";
         version = "0.41";
         src = fetchFromGitHub {
           owner = "kelvinh";
@@ -34597,6 +35929,7 @@
                                         , s }:
       melpaBuild {
         pname = "org-password-manager";
+        ename = "org-password-manager";
         version = "0.0.1";
         src = fetchgit {
           url = "https://github.com/leafac/org-password-manager";
@@ -34622,6 +35955,7 @@
                                , pdf-tools }:
       melpaBuild {
         pname = "org-pdfview";
+        ename = "org-pdfview";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "markus1189";
@@ -34648,6 +35982,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-pomodoro";
+        ename = "org-pomodoro";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "lolownia";
@@ -34677,6 +36012,7 @@
                                   , s }:
       melpaBuild {
         pname = "org-projectile";
+        ename = "org-projectile";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -34704,6 +36040,7 @@
                                        , org-projectile }:
       melpaBuild {
         pname = "org-projectile-helm";
+        ename = "org-projectile-helm";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -34728,6 +36065,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "org-protocol-jekyll";
+        ename = "org-protocol-jekyll";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "vonavi";
@@ -34754,6 +36092,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-random-todo";
+        ename = "org-random-todo";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -34782,6 +36121,7 @@
                               , yaoddmuse }:
       melpaBuild {
         pname = "org-readme";
+        ename = "org-readme";
         version = "20130322.926";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -34816,6 +36156,7 @@
                            , s }:
       melpaBuild {
         pname = "org-ref";
+        ename = "org-ref";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "jkitchin";
@@ -34851,6 +36192,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-repo-todo";
+        ename = "org-repo-todo";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "waymondo";
@@ -34876,6 +36218,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "org-rich-yank";
+        ename = "org-rich-yank";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "unhammer";
@@ -34901,6 +36244,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "org-static-blog";
+        ename = "org-static-blog";
         version = "1.2.1";
         src = fetchFromGitHub {
           owner = "bastibe";
@@ -34928,6 +36272,7 @@
                             , org }:
       melpaBuild {
         pname = "org-sync";
+        ename = "org-sync";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "arbox";
@@ -34952,6 +36297,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "org-table-comment";
+        ename = "org-table-comment";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -34977,6 +36323,7 @@
                                            , org }:
       melpaBuild {
         pname = "org-table-sticky-header";
+        ename = "org-table-sticky-header";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -35004,6 +36351,7 @@
                            , org }:
       melpaBuild {
         pname = "org-tfl";
+        ename = "org-tfl";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "storax";
@@ -35029,6 +36377,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "org-themis";
+        ename = "org-themis";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "zellio";
@@ -35055,6 +36404,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "org-time-budgets";
+        ename = "org-time-budgets";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "leoc";
@@ -35079,6 +36429,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "org-toodledo";
+        ename = "org-toodledo";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -35105,6 +36456,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-tracktable";
+        ename = "org-tracktable";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "tty-tourist";
@@ -35131,6 +36483,7 @@
                                             , s }:
       melpaBuild {
         pname = "org-transform-tree-table";
+        ename = "org-transform-tree-table";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "jplindstrom";
@@ -35155,6 +36508,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "org-tree-slide";
+        ename = "org-tree-slide";
         version = "2.8.4";
         src = fetchFromGitHub {
           owner = "takaxp";
@@ -35184,6 +36538,7 @@
                               , s }:
       melpaBuild {
         pname = "org-trello";
+        ename = "org-trello";
         version = "0.8.1";
         src = fetchFromGitHub {
           owner = "org-trello";
@@ -35208,6 +36563,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "org-vcard";
+        ename = "org-vcard";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "flexibeast";
@@ -35235,6 +36591,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "org-wild-notifier";
+        ename = "org-wild-notifier";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "akhramov";
@@ -35263,6 +36620,7 @@
                             , xml-rpc }:
       melpaBuild {
         pname = "org2blog";
+        ename = "org2blog";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "punchagan";
@@ -35290,6 +36648,7 @@
                               , s }:
       melpaBuild {
         pname = "org2jekyll";
+        ename = "org2jekyll";
         version = "0.1.9";
         src = fetchFromGitHub {
           owner = "ardumont";
@@ -35322,6 +36681,7 @@
                            , simple-httpd }:
       melpaBuild {
         pname = "org2web";
+        ename = "org2web";
         version = "0.9.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -35357,6 +36717,7 @@
                           , org }:
       melpaBuild {
         pname = "orgbox";
+        ename = "orgbox";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "yasuhito";
@@ -35385,6 +36746,7 @@
                          , org }:
       melpaBuild {
         pname = "orgit";
+        ename = "orgit";
         version = "1.5.1";
         src = fetchFromGitHub {
           owner = "magit";
@@ -35412,6 +36774,7 @@
                            , org }:
       melpaBuild {
         pname = "orglink";
+        ename = "orglink";
         version = "1.1.3";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -35436,6 +36799,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "orgtbl-show-header";
+        ename = "orgtbl-show-header";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -35462,6 +36826,7 @@
                               , string-utils }:
       melpaBuild {
         pname = "osx-browse";
+        ename = "osx-browse";
         version = "0.8.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -35486,6 +36851,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "osx-clipboard";
+        ename = "osx-clipboard";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -35511,6 +36877,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "osx-dictionary";
+        ename = "osx-dictionary";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -35535,6 +36902,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "osx-location";
+        ename = "osx-location";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -35559,6 +36927,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "osx-pseudo-daemon";
+        ename = "osx-pseudo-daemon";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -35584,6 +36953,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "osx-trash";
+        ename = "osx-trash";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -35609,6 +36979,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "outlook";
+        ename = "outlook";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "asavonic";
@@ -35633,6 +37004,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "outorg";
+        ename = "outorg";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -35657,6 +37029,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "outshine";
+        ename = "outshine";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -35682,6 +37055,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ov";
+        ename = "ov";
         version = "1.0.6";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
@@ -35707,6 +37081,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "overcast-theme";
+        ename = "overcast-theme";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -35734,6 +37109,7 @@
                             , pkg-info }:
       melpaBuild {
         pname = "overseer";
+        ename = "overseer";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tonini";
@@ -35761,6 +37137,7 @@
                             , yaxception }:
       melpaBuild {
         pname = "owdriver";
+        ename = "owdriver";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -35787,6 +37164,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-epub";
+        ename = "ox-epub";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "ofosos";
@@ -35811,6 +37189,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ox-gfm";
+        ename = "ox-gfm";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -35837,6 +37216,7 @@
                            , org }:
       melpaBuild {
         pname = "ox-hugo";
+        ename = "ox-hugo";
         version = "0.8";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
@@ -35865,6 +37245,7 @@
                               , org }:
       melpaBuild {
         pname = "ox-ioslide";
+        ename = "ox-ioslide";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -35893,6 +37274,7 @@
                              , org }:
       melpaBuild {
         pname = "ox-pandoc";
+        ename = "ox-pandoc";
         version = "1.150707";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -35917,6 +37299,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ox-twbs";
+        ename = "ox-twbs";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "marsmining";
@@ -35941,6 +37324,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pabbrev";
+        ename = "pabbrev";
         version = "4.1";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -35966,6 +37350,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "package-build";
+        ename = "package-build";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "melpa";
@@ -35992,6 +37377,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "package-lint";
+        ename = "package-lint";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -36016,6 +37402,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "package-plus";
+        ename = "package+";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "zenspider";
@@ -36042,6 +37429,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "package-safe-delete";
+        ename = "package-safe-delete";
         version = "0.1.7";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -36067,6 +37455,7 @@
                                  , restart-emacs }:
       melpaBuild {
         pname = "package-utils";
+        ename = "package-utils";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "Silex";
@@ -36092,6 +37481,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "packed";
+        ename = "packed";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
@@ -36116,6 +37506,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "page-break-lines";
+        ename = "page-break-lines";
         version = "0.11";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -36144,6 +37535,7 @@
                           , s }:
       melpaBuild {
         pname = "pallet";
+        ename = "pallet";
         version = "0.9.2";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -36169,6 +37561,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "panda-theme";
+        ename = "panda-theme";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "jamiecollinson";
@@ -36194,6 +37587,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pandoc";
+        ename = "pandoc";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -36220,6 +37614,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pandoc-mode";
+        ename = "pandoc-mode";
         version = "2.25";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -36244,6 +37639,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pangu-spacing";
+        ename = "pangu-spacing";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -36273,6 +37669,7 @@
                            , spinner }:
       melpaBuild {
         pname = "paradox";
+        ename = "paradox";
         version = "2.5.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -36297,6 +37694,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "paredit";
+        ename = "paredit";
         version = "24";
         src = fetchgit {
           url = "https://mumble.net/~campbell/git/paredit.git";
@@ -36321,6 +37719,7 @@
                                       , paredit }:
       melpaBuild {
         pname = "paredit-everywhere";
+        ename = "paredit-everywhere";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -36345,6 +37744,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "paren-face";
+        ename = "paren-face";
         version = "1.0.4";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -36369,6 +37769,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "parent-mode";
+        ename = "parent-mode";
         version = "2.3";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -36395,6 +37796,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parinfer";
+        ename = "parinfer";
         version = "0.4.10";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
@@ -36420,6 +37822,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parsebib";
+        ename = "parsebib";
         version = "2.3.2";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -36446,6 +37849,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "parsec";
+        ename = "parsec";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -36472,6 +37876,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "parseclj";
+        ename = "parseclj";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
@@ -36499,6 +37904,7 @@
                         , password-store }:
       melpaBuild {
         pname = "pass";
+        ename = "pass";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -36525,6 +37931,7 @@
                           , password-store }:
       melpaBuild {
         pname = "passmm";
+        ename = "passmm";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "pjones";
@@ -36550,6 +37957,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "passthword";
+        ename = "passthword";
         version = "1.4";
         src = fetchFromGitLab {
           owner = "pidu";
@@ -36578,6 +37986,7 @@
                                   , with-editor }:
       melpaBuild {
         pname = "password-store";
+        ename = "password-store";
         version = "1.7.2";
         src = fetchFromGitHub {
           owner = "zx2c4";
@@ -36605,6 +38014,7 @@
                                       , s }:
       melpaBuild {
         pname = "password-store-otp";
+        ename = "password-store-otp";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "volrath";
@@ -36629,6 +38039,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pastehub";
+        ename = "pastehub";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "kiyoka";
@@ -36654,6 +38065,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "pastelmac-theme";
+        ename = "pastelmac-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -36680,6 +38092,7 @@
                            , request }:
       melpaBuild {
         pname = "pastery";
+        ename = "pastery";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "diasbruno";
@@ -36704,6 +38117,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pathify";
+        ename = "pathify";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -36730,6 +38144,7 @@
                            , paredit }:
       melpaBuild {
         pname = "paxedit";
+        ename = "paxedit";
         version = "1.1.8";
         src = fetchFromGitHub {
           owner = "promethial";
@@ -36755,6 +38170,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pcache";
+        ename = "pcache";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "sigma";
@@ -36781,6 +38197,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "pcomplete-extension";
+        ename = "pcomplete-extension";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -36807,6 +38224,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pcre2el";
+        ename = "pcre2el";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "joddie";
@@ -36831,6 +38249,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "pcsv";
+        ename = "pcsv";
         version = "1.3.6";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -36858,6 +38277,7 @@
                              , tablist }:
       melpaBuild {
         pname = "pdf-tools";
+        ename = "pdf-tools";
         version = "0.80";
         src = fetchFromGitHub {
           owner = "politza";
@@ -36882,6 +38302,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "peg";
+        ename = "peg";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "ellerh";
@@ -36907,6 +38328,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "pelican-mode";
+        ename = "pelican-mode";
         version = "20170808";
         src = fetchgit {
           url = "https://git.korewanetadesu.com/pelican-mode.git";
@@ -36937,7 +38359,7 @@
           rev = "9e6200da91b3";
           sha256 = "0w02l91x624cgzdg33a9spgcwy12m607dsfnr1xbc1fi08np4sd1";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
@@ -36955,6 +38377,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "persistent-scratch";
+        ename = "persistent-scratch";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -36981,6 +38404,7 @@
                                    , pcache }:
       melpaBuild {
         pname = "persistent-soft";
+        ename = "persistent-soft";
         version = "0.8.10";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -37007,6 +38431,7 @@
                             , persp-mode }:
       melpaBuild {
         pname = "persp-fr";
+        ename = "persp-fr";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -37031,6 +38456,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "persp-mode";
+        ename = "persp-mode";
         version = "2.9.6";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
@@ -37058,6 +38484,7 @@
                                     , projectile }:
       melpaBuild {
         pname = "persp-projectile";
+        ename = "persp-projectile";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -37083,12 +38510,13 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "perspective";
-        version = "2.1";
+        ename = "perspective";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "7d1a16fb3058966ac3b2bea52225373bd3aa30cd";
-          sha256 = "0qbxrcxdsnsvap1p6nrh0r4bxx2xvjz3y1mjk2wwbcj5hw2jkk0r";
+          rev = "8e2f122de408d7866136dd861d513a9575cf32e6";
+          sha256 = "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspective";
@@ -37107,6 +38535,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "perspeen";
+        ename = "perspeen";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "seudut";
@@ -37132,6 +38561,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pfuture";
+        ename = "pfuture";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -37157,6 +38587,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ph";
+        ename = "ph";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "gromnitsky";
@@ -37184,6 +38615,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "phan";
+        ename = "phan";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -37208,6 +38640,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "phi-search";
+        ename = "phi-search";
         version = "20160630";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -37234,6 +38667,7 @@
                                  , phi-search }:
       melpaBuild {
         pname = "phi-search-mc";
+        ename = "phi-search-mc";
         version = "2.2.1";
         src = fetchFromGitHub {
           owner = "knu";
@@ -37260,6 +38694,7 @@
                                        , yasnippet }:
       melpaBuild {
         pname = "php-auto-yasnippets";
+        ename = "php-auto-yasnippets";
         version = "2.3.1";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -37285,6 +38720,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "php-cs-fixer";
+        ename = "php-cs-fixer";
         version = "1.0.-2.4";
         src = fetchFromGitHub {
           owner = "OVYA";
@@ -37311,6 +38747,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "php-mode";
+        ename = "php-mode";
         version = "1.19.1";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -37337,6 +38774,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "php-runtime";
+        ename = "php-runtime";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -37363,6 +38801,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "phpactor";
+        ename = "phpactor";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -37388,6 +38827,7 @@
                           , s }:
       melpaBuild {
         pname = "phpcbf";
+        ename = "phpcbf";
         version = "0.9.2";
         src = fetchFromGitHub {
           owner = "nishimaki10";
@@ -37413,12 +38853,13 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "phpstan";
-        version = "0.2.1";
+        ename = "phpstan";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpstan.el";
-          rev = "3653f2a316f4199cbd3238e984eea2325e2618d5";
-          sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d";
+          rev = "09102b062b607affc93f2d8a113a9fc9f9cf3016";
+          sha256 = "0n21vyvd5c42v03xcfx94dz252z3s413i0f9pwjrssq2yd3x2bgm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan";
@@ -37442,6 +38883,7 @@
                            , s }:
       melpaBuild {
         pname = "phpunit";
+        ename = "phpunit";
         version = "0.16.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -37467,6 +38909,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pillar";
+        ename = "pillar";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "pillar-markup";
@@ -37492,6 +38935,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pinboard-popular";
+        ename = "pinboard-popular";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "asimpson";
@@ -37516,6 +38960,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pinyin-search";
+        ename = "pinyin-search";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -37540,6 +38985,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "pinyinlib";
+        ename = "pinyinlib";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
@@ -37565,6 +39011,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pip-requirements";
+        ename = "pip-requirements";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -37589,6 +39036,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "pixiv-novel-mode";
+        ename = "pixiv-novel-mode";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -37614,6 +39062,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pkg-info";
+        ename = "pkg-info";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "lunaryorn";
@@ -37638,6 +39087,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pkgbuild-mode";
+        ename = "pkgbuild-mode";
         version = "0.14";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
@@ -37663,6 +39113,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "plain-theme";
+        ename = "plain-theme";
         version = "8";
         src = fetchFromGitLab {
           owner = "yegortimoshenko";
@@ -37687,6 +39138,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "plantuml-mode";
+        ename = "plantuml-mode";
         version = "1.2.5";
         src = fetchFromGitHub {
           owner = "skuro";
@@ -37712,6 +39164,7 @@
                                    , projectile }:
       melpaBuild {
         pname = "platformio-mode";
+        ename = "platformio-mode";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "ZachMassia";
@@ -37739,6 +39192,7 @@
                                 , request }:
       melpaBuild {
         pname = "play-crystal";
+        ename = "play-crystal";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "veelenga";
@@ -37763,6 +39217,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "play-routes-mode";
+        ename = "play-routes-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "brocode";
@@ -37787,6 +39242,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "plenv";
+        ename = "plenv";
         version = "0.32";
         src = fetchFromGitHub {
           owner = "karupanerura";
@@ -37814,6 +39270,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "plsense";
+        ename = "plsense";
         version = "0.4.7";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -37842,6 +39299,7 @@
                                  , yaxception }:
       melpaBuild {
         pname = "plsense-direx";
+        ename = "plsense-direx";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -37867,6 +39325,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "plur";
+        ename = "plur";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -37891,6 +39350,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "po-mode";
+        ename = "po-mode";
         version = "0.19.8.1";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
@@ -37919,6 +39379,7 @@
                               , s }:
       melpaBuild {
         pname = "pocket-lib";
+        ename = "pocket-lib";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -37951,6 +39412,7 @@
                                  , s }:
       melpaBuild {
         pname = "pocket-reader";
+        ename = "pocket-reader";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "alphapapa";
@@ -37984,6 +39446,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "point-pos";
+        ename = "point-pos";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -38010,6 +39473,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pomidor";
+        ename = "pomidor";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "TatriX";
@@ -38035,6 +39499,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "pony-snippets";
+        ename = "pony-snippets";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -38060,6 +39525,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ponylang-mode";
+        ename = "ponylang-mode";
         version = "0.0.9";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
@@ -38087,6 +39553,7 @@
                            , yaxception }:
       melpaBuild {
         pname = "pophint";
+        ename = "pophint";
         version = "0.9.3";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -38112,6 +39579,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "popup";
+        ename = "popup";
         version = "0.5.3";
         src = fetchFromGitHub {
           owner = "auto-complete";
@@ -38137,6 +39605,7 @@
                                   , popup }:
       melpaBuild {
         pname = "popup-complete";
+        ename = "popup-complete";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -38164,6 +39633,7 @@
                                , popup }:
       melpaBuild {
         pname = "popup-imenu";
+        ename = "popup-imenu";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "ancane";
@@ -38188,6 +39658,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "popwin";
+        ename = "popwin";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -38212,6 +39683,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "pos-tip";
+        ename = "pos-tip";
         version = "0.4.6";
         src = fetchFromGitHub {
           owner = "pitkali";
@@ -38237,6 +39709,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "powerline";
+        ename = "powerline";
         version = "2.4";
         src = fetchFromGitHub {
           owner = "milkypostman";
@@ -38261,6 +39734,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "powershell";
+        ename = "powershell";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "jschaf";
@@ -38287,6 +39761,7 @@
                                    , sr-speedbar }:
       melpaBuild {
         pname = "ppd-sr-speedbar";
+        ename = "ppd-sr-speedbar";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -38311,6 +39786,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "prassee-theme";
+        ename = "prassee-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "prassee";
@@ -38336,6 +39812,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prescient";
+        ename = "prescient";
         version = "2.0";
         src = fetchFromGitHub {
           owner = "raxod502";
@@ -38362,6 +39839,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "presentation";
+        ename = "presentation";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -38386,6 +39864,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pretty-mode";
+        ename = "pretty-mode";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "akatov";
@@ -38411,6 +39890,7 @@
                                    , yasnippet }:
       melpaBuild {
         pname = "processing-mode";
+        ename = "processing-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "ptrv";
@@ -38442,7 +39922,7 @@
           rev = "228bc56369675787d60f637223b50ce3a1afebbd";
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
@@ -38463,6 +39943,7 @@
                            , s }:
       melpaBuild {
         pname = "prodigy";
+        ename = "prodigy";
         version = "0.7.0";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -38489,6 +39970,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prog-fill";
+        ename = "prog-fill";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -38517,6 +39999,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "project-explorer";
+        ename = "project-explorer";
         version = "0.14.3";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -38541,6 +40024,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "project-persist";
+        ename = "project-persist";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -38566,6 +40050,7 @@
                                           , project-persist }:
       melpaBuild {
         pname = "project-persist-drawer";
+        ename = "project-persist-drawer";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "rdallasgray";
@@ -38596,7 +40081,7 @@
           rev = "843ca1f4ab2b";
           sha256 = "0nw02f5lmbqdfnw93d3383sdxx1d31szk23zvjlrmmdwv2124281";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
@@ -38607,7 +40092,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile = callPackage ({ dash
+    projectile = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
                               , lib
@@ -38615,19 +40100,20 @@
                               , pkg-info }:
       melpaBuild {
         pname = "projectile";
-        version = "0.14.0";
+        ename = "projectile";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "19fb9fa6590e1dc49afc3c8c5bd69cff6cf743a7";
-          sha256 = "1kp0y81csmjxwyrdbj60f89phw3gkg3hm5xp3k4fvymzsrxrhm9l";
+          rev = "09d1ef17a20c42dc6a2b1622df8faa8fb1c6ad9f";
+          sha256 = "1yyphiy2bc4kzc1bz1akfz5rrdrs0bq3zvsyam9bsx03jixzn7yv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "recipe";
         };
-        packageRequires = [ dash pkg-info ];
+        packageRequires = [ emacs pkg-info ];
         meta = {
           homepage = "https://melpa.org/#/projectile";
           license = lib.licenses.free;
@@ -38641,6 +40127,7 @@
                                             , projectile }:
       melpaBuild {
         pname = "projectile-git-autofetch";
+        ename = "projectile-git-autofetch";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "andrmuel";
@@ -38671,6 +40158,7 @@
                                     , rake }:
       melpaBuild {
         pname = "projectile-rails";
+        ename = "projectile-rails";
         version = "0.16.0";
         src = fetchFromGitHub {
           owner = "asok";
@@ -38697,6 +40185,7 @@
                                       , ripgrep }:
       melpaBuild {
         pname = "projectile-ripgrep";
+        ename = "projectile-ripgrep";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -38723,6 +40212,7 @@
                                    , sift }:
       melpaBuild {
         pname = "projectile-sift";
+        ename = "projectile-sift";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -38753,6 +40243,7 @@
                                           , rake }:
       melpaBuild {
         pname = "projectile-trailblazer";
+        ename = "projectile-trailblazer";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "micdahl";
@@ -38779,6 +40270,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "projectile-variable";
+        ename = "projectile-variable";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -38804,6 +40296,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "projekt";
+        ename = "projekt";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tekai";
@@ -38828,6 +40321,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "prompt-text";
+        ename = "prompt-text";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -38854,6 +40348,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "prop-menu";
+        ename = "prop-menu";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -38878,6 +40373,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "protobuf-mode";
+        ename = "protobuf-mode";
         version = "3.6.0.1";
         src = fetchFromGitHub {
           owner = "google";
@@ -38903,6 +40399,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "protocols";
+        ename = "protocols";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "davep";
@@ -38932,6 +40429,7 @@
                         , s }:
       melpaBuild {
         pname = "psci";
+        ename = "psci";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "purescript-emacs";
@@ -38959,6 +40457,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "psession";
+        ename = "psession";
         version = "1.5";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -38986,6 +40485,7 @@
                          , s }:
       melpaBuild {
         pname = "psysh";
+        ename = "psysh";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -39010,6 +40510,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "pt";
+        ename = "pt";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "bling";
@@ -39036,6 +40537,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "pug-mode";
+        ename = "pug-mode";
         version = "1.0.7";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -39060,6 +40562,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "punctuality-logger";
+        ename = "punctuality-logger";
         version = "0.8";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -39086,6 +40589,7 @@
                          , pyvenv }:
       melpaBuild {
         pname = "pungi";
+        ename = "pungi";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "mgrbyte";
@@ -39113,6 +40617,7 @@
                                , pkg-info }:
       melpaBuild {
         pname = "puppet-mode";
+        ename = "puppet-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "voxpupuli";
@@ -39137,6 +40642,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "purescript-mode";
+        ename = "purescript-mode";
         version = "13.10";
         src = fetchFromGitHub {
           owner = "dysinger";
@@ -39163,6 +40669,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "pushbullet";
+        ename = "pushbullet";
         version = "0.5.2";
         src = fetchFromGitHub {
           owner = "theanalyst";
@@ -39187,6 +40694,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "py-autopep8";
+        ename = "py-autopep8";
         version = "2016.1";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -39211,6 +40719,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "py-isort";
+        ename = "py-isort";
         version = "2016.1";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -39235,6 +40744,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "py-yapf";
+        ename = "py-yapf";
         version = "2016.1";
         src = fetchFromGitHub {
           owner = "paetzke";
@@ -39261,6 +40771,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "pycarddavel";
+        ename = "pycarddavel";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -39285,6 +40796,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "pydoc";
+        ename = "pydoc";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "statmobile";
@@ -39310,6 +40822,7 @@
                               , pythonic }:
       melpaBuild {
         pname = "pyenv-mode";
+        ename = "pyenv-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -39339,6 +40852,7 @@
                         , pyim-basedict }:
       melpaBuild {
         pname = "pyim";
+        ename = "pyim";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -39363,6 +40877,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "pyim-basedict";
+        ename = "pyim-basedict";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -39388,6 +40903,7 @@
                                , pyim }:
       melpaBuild {
         pname = "pyim-wbdict";
+        ename = "pyim-wbdict";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "tumashu";
@@ -39414,6 +40930,7 @@
                             , s }:
       melpaBuild {
         pname = "pyimport";
+        ename = "pyimport";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -39443,6 +40960,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "pynt";
+        ename = "pynt";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ebanner";
@@ -39468,6 +40986,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "python-environment";
+        ename = "python-environment";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -39492,6 +41011,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "python-mode";
+        ename = "python-mode";
         version = "6.2.3";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
@@ -39522,6 +41042,7 @@
                                  , s }:
       melpaBuild {
         pname = "python-pytest";
+        ename = "python-pytest";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "wbolster";
@@ -39555,6 +41076,7 @@
                             , python ? null }:
       melpaBuild {
         pname = "python-x";
+        ename = "python-x";
         version = "1.0";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -39584,6 +41106,7 @@
                             , s }:
       melpaBuild {
         pname = "pythonic";
+        ename = "pythonic";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -39608,6 +41131,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "pyvenv";
+        ename = "pyvenv";
         version = "1.16";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -39632,6 +41156,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "qiita";
+        ename = "qiita";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "gongo";
@@ -39657,6 +41182,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ql";
+        ename = "ql";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -39681,6 +41207,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "qml-mode";
+        ename = "qml-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "coldnew";
@@ -39706,6 +41233,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "qt-pro-mode";
+        ename = "qt-pro-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -39730,6 +41258,7 @@
                                           , melpaBuild }:
       melpaBuild {
         pname = "quasi-monochrome-theme";
+        ename = "quasi-monochrome-theme";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "lbolla";
@@ -39755,6 +41284,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "quickrun";
+        ename = "quickrun";
         version = "2.2.8";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -39781,6 +41311,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "quiz";
+        ename = "quiz";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "davep";
@@ -39805,6 +41336,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "r-autoyas";
+        ename = "r-autoyas";
         version = "0.28";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -39834,6 +41366,7 @@
                          , s }:
       melpaBuild {
         pname = "racer";
+        ename = "racer";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "racer-rust";
@@ -39858,6 +41391,7 @@
                                              , melpaBuild }:
       melpaBuild {
         pname = "railscasts-reloaded-theme";
+        ename = "railscasts-reloaded-theme";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
@@ -39882,6 +41416,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rainbow-blocks";
+        ename = "rainbow-blocks";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
@@ -39906,6 +41441,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "rainbow-delimiters";
+        ename = "rainbow-delimiters";
         version = "2.1.3";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -39931,6 +41467,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "rainbow-identifiers";
+        ename = "rainbow-identifiers";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -39958,6 +41495,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rake";
+        ename = "rake";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "asok";
@@ -39983,6 +41521,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "ranger";
+        ename = "ranger";
         version = "0.9.8.5";
         src = fetchFromGitHub {
           owner = "ralesi";
@@ -40007,6 +41546,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rase";
+        ename = "rase";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -40034,6 +41574,7 @@
                         , s }:
       melpaBuild {
         pname = "rats";
+        ename = "rats";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "ane";
@@ -40058,6 +41599,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rbenv";
+        ename = "rbenv";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "senny";
@@ -40082,6 +41624,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "rc-mode";
+        ename = "rc-mode";
         version = "1.0.13";
         src = fetchFromGitHub {
           owner = "mrhmouse";
@@ -40107,6 +41650,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "rcirc-styles";
+        ename = "rcirc-styles";
         version = "1.3.2";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -40131,6 +41675,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rdf-prefix";
+        ename = "rdf-prefix";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "simenheg";
@@ -40156,6 +41701,7 @@
                                   , yasnippet }:
       melpaBuild {
         pname = "react-snippets";
+        ename = "react-snippets";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "johnmastro";
@@ -40180,6 +41726,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "real-auto-save";
+        ename = "real-auto-save";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "chillaranand";
@@ -40209,6 +41756,7 @@
                            , test-simple }:
       melpaBuild {
         pname = "realgud";
+        ename = "realgud";
         version = "1.4.5";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -40240,6 +41788,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "reason-mode";
+        ename = "reason-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "reasonml-editor";
@@ -40265,6 +41814,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "rebecca-theme";
+        ename = "rebecca-theme";
         version = "1.2.1";
         src = fetchFromGitHub {
           owner = "vic";
@@ -40289,6 +41839,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "recover-buffers";
+        ename = "recover-buffers";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "tripleee";
@@ -40313,6 +41864,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rect-plus";
+        ename = "rect+";
         version = "1.0.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -40339,6 +41891,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "rectangle-utils";
+        ename = "rectangle-utils";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -40366,6 +41919,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "redpen-paragraph";
+        ename = "redpen-paragraph";
         version = "0.42";
         src = fetchFromGitHub {
           owner = "karronoli";
@@ -40391,6 +41945,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "redprl";
+        ename = "redprl";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "RedPRL";
@@ -40416,6 +41971,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "redtick";
+        ename = "redtick";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "ferfebles";
@@ -40445,6 +42001,7 @@
                           , s }:
       melpaBuild {
         pname = "refine";
+        ename = "refine";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
@@ -40469,6 +42026,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "region-convert";
+        ename = "region-convert";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "zonuexe";
@@ -40494,6 +42052,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "relax";
+        ename = "relax";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -40519,6 +42078,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "repeatable-motion";
+        ename = "repeatable-motion";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "willghatch";
@@ -40544,6 +42104,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "repl-toggle";
+        ename = "repl-toggle";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "tomterl";
@@ -40568,6 +42129,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "replace-symbol";
+        ename = "replace-symbol";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -40594,6 +42156,7 @@
                                             , string-inflection }:
       melpaBuild {
         pname = "replace-with-inflections";
+        ename = "replace-with-inflections";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "knu";
@@ -40619,6 +42182,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "repo";
+        ename = "repo";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "canatella";
@@ -40647,6 +42211,7 @@
                                , use-package }:
       melpaBuild {
         pname = "req-package";
+        ename = "req-package";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "edvorg";
@@ -40672,6 +42237,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "request";
+        ename = "request";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -40698,6 +42264,7 @@
                                     , request }:
       melpaBuild {
         pname = "request-deferred";
+        ename = "request-deferred";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tkf";
@@ -40726,6 +42293,7 @@
                              , s }:
       melpaBuild {
         pname = "requirejs";
+        ename = "requirejs";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "joeheyming";
@@ -40752,6 +42320,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "resize-window";
+        ename = "resize-window";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "dpsutton";
@@ -40776,6 +42345,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "restart-emacs";
+        ename = "restart-emacs";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "iqbalansari";
@@ -40802,6 +42372,7 @@
                                    , restclient }:
       melpaBuild {
         pname = "restclient-test";
+        ename = "restclient-test";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "simenheg";
@@ -40826,6 +42397,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "reveal-in-osx-finder";
+        ename = "reveal-in-osx-finder";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "kaz-yos";
@@ -40850,6 +42422,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "reverse-theme";
+        ename = "reverse-theme";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -40877,6 +42450,7 @@
                       , s }:
       melpaBuild {
         pname = "rg";
+        ename = "rg";
         version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dajva";
@@ -40902,6 +42476,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "rib-mode";
+        ename = "rib-mode";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "blezek";
@@ -40927,6 +42502,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "rich-minority";
+        ename = "rich-minority";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -40952,6 +42528,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rigid-tabs";
+        ename = "rigid-tabs";
         version = "1.0";
         src = fetchFromGitLab {
           owner = "wavexx";
@@ -40980,6 +42557,7 @@
                           , ruby-mode ? null }:
       melpaBuild {
         pname = "rinari";
+        ename = "rinari";
         version = "2.11";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -41004,6 +42582,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "ripgrep";
+        ename = "ripgrep";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -41030,6 +42609,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rjsx-mode";
+        ename = "rjsx-mode";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "felipeochoa";
@@ -41056,6 +42636,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "robe";
+        ename = "robe";
         version = "0.8.1";
         src = fetchFromGitHub {
           owner = "dgutov";
@@ -41080,6 +42661,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "robots-txt-mode";
+        ename = "robots-txt-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "emacs-php";
@@ -41105,6 +42687,7 @@
                               , popup }:
       melpaBuild {
         pname = "roguel-ike";
+        ename = "roguel-ike";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "stevenremot";
@@ -41129,6 +42712,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "rope-read-mode";
+        ename = "rope-read-mode";
         version = "0.3.4";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -41153,6 +42737,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "rsense";
+        ename = "rsense";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -41179,6 +42764,7 @@
                               , ruby-mode ? null }:
       melpaBuild {
         pname = "rspec-mode";
+        ename = "rspec-mode";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "pezra";
@@ -41203,6 +42789,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rtags";
+        ename = "rtags";
         version = "2.18";
         src = fetchFromGitHub {
           owner = "Andersbakken";
@@ -41230,6 +42817,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "rubik";
+        ename = "rubik";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "Kurvivor19";
@@ -41255,6 +42843,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "rubocop";
+        ename = "rubocop";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -41280,6 +42869,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "rubocopfmt";
+        ename = "rubocopfmt";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -41305,6 +42895,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ruby-compilation";
+        ename = "ruby-compilation";
         version = "2.11";
         src = fetchFromGitHub {
           owner = "eschulte";
@@ -41329,6 +42920,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "ruby-electric";
+        ename = "ruby-electric";
         version = "2.3.1";
         src = fetchFromGitHub {
           owner = "knu";
@@ -41353,6 +42945,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ruby-end";
+        ename = "ruby-end";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -41377,6 +42970,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ruby-hash-syntax";
+        ename = "ruby-hash-syntax";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -41401,6 +42995,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "ruby-test-mode";
+        ename = "ruby-test-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "r0man";
@@ -41425,6 +43020,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ruby-tools";
+        ename = "ruby-tools";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -41450,6 +43046,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "rufo";
+        ename = "rufo";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "danielma";
@@ -41474,6 +43071,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "runner";
+        ename = "runner";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "thamer";
@@ -41498,6 +43096,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "russian-holidays";
+        ename = "russian-holidays";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -41523,6 +43122,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "rust-mode";
+        ename = "rust-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "rust-lang";
@@ -41549,6 +43149,7 @@
                                    , rust-mode }:
       melpaBuild {
         pname = "rust-playground";
+        ename = "rust-playground";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "grafov";
@@ -41573,6 +43174,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "rvm";
+        ename = "rvm";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "senny";
@@ -41597,6 +43199,7 @@
                      , melpaBuild }:
       melpaBuild {
         pname = "s";
+        ename = "s";
         version = "1.12.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -41621,6 +43224,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sackspace";
+        ename = "sackspace";
         version = "0.8.2";
         src = fetchFromGitHub {
           owner = "cofi";
@@ -41649,6 +43253,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "sage-shell-mode";
+        ename = "sage-shell-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "sagemath";
@@ -41676,6 +43281,7 @@
                              , yaml-mode }:
       melpaBuild {
         pname = "salt-mode";
+        ename = "salt-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "glynnforrest";
@@ -41701,6 +43307,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sass-mode";
+        ename = "sass-mode";
         version = "3.0.18";
         src = fetchFromGitHub {
           owner = "nex3";
@@ -41725,6 +43332,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sauron";
+        ename = "sauron";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "djcb";
@@ -41749,6 +43357,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "say-what-im-doing";
+        ename = "say-what-im-doing";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "benaiah";
@@ -41774,6 +43383,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "sayid";
+        ename = "sayid";
         version = "0.0.16";
         src = fetchFromGitHub {
           owner = "bpiel";
@@ -41799,6 +43409,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sbt-mode";
+        ename = "sbt-mode";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -41823,6 +43434,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "scala-mode";
+        ename = "scala-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "ensime";
@@ -41848,6 +43460,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "schrute";
+        ename = "schrute";
         version = "0.2.2";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/dwight-k.-schrute";
@@ -41872,6 +43485,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "scpaste";
+        ename = "scpaste";
         version = "0.6.5";
         src = fetchFromGitHub {
           owner = "technomancy";
@@ -41896,6 +43510,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "scss-mode";
+        ename = "scss-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "antonj";
@@ -41920,6 +43535,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "search-web";
+        ename = "search-web";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "tomoya";
@@ -41949,6 +43565,7 @@
                               , s }:
       melpaBuild {
         pname = "secretaria";
+        ename = "secretaria";
         version = "0.2.7";
         src = fetchgit {
           url = "https://bitbucket.org/shackra/secretaria.el";
@@ -41975,6 +43592,7 @@
                          , popup }:
       melpaBuild {
         pname = "sekka";
+        ename = "sekka";
         version = "1.8.0";
         src = fetchFromGitHub {
           owner = "kiyoka";
@@ -41999,6 +43617,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "select-themes";
+        ename = "select-themes";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "jasonm23";
@@ -42023,6 +43642,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "selectric-mode";
+        ename = "selectric-mode";
         version = "1.4.1";
         src = fetchFromGitHub {
           owner = "rbanffy";
@@ -42055,6 +43675,7 @@
                            , web-server }:
       melpaBuild {
         pname = "servant";
+        ename = "servant";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "cask";
@@ -42083,6 +43704,7 @@
                               , s }:
       melpaBuild {
         pname = "serverspec";
+        ename = "serverspec";
         version = "0.0.7";
         src = fetchFromGitHub {
           owner = "k1LoW";
@@ -42108,6 +43730,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "services";
+        ename = "services";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "davep";
@@ -42133,6 +43756,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "sesman";
+        ename = "sesman";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -42157,6 +43781,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "session";
+        ename = "session";
         version = "2.3.1";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -42181,6 +43806,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sexp-move";
+        ename = "sexp-move";
         version = "0.2.6";
         src = fetchFromGitLab {
           owner = "elzair";
@@ -42205,6 +43831,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "sexy-monochrome-theme";
+        ename = "sexy-monochrome-theme";
         version = "3.1";
         src = fetchFromGitHub {
           owner = "voloyev";
@@ -42230,6 +43857,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shackle";
+        ename = "shackle";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -42254,6 +43882,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "shakespeare-mode";
+        ename = "shakespeare-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "CodyReichert";
@@ -42278,6 +43907,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shampoo";
+        ename = "shampoo";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "dmatveev";
@@ -42304,6 +43934,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "shell-pop";
+        ename = "shell-pop";
         version = "0.64";
         src = fetchFromGitHub {
           owner = "kyagi";
@@ -42328,6 +43959,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "shell-split-string";
+        ename = "shell-split-string";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -42352,6 +43984,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "shell-switcher";
+        ename = "shell-switcher";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -42376,6 +44009,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "shell-toggle";
+        ename = "shell-toggle";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "knu";
@@ -42402,6 +44036,7 @@
                             , s }:
       melpaBuild {
         pname = "shelldoc";
+        ename = "shelldoc";
         version = "0.0.5";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -42426,6 +44061,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "shelltest-mode";
+        ename = "shelltest-mode";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "rtrn";
@@ -42451,6 +44087,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shen-elisp";
+        ename = "shen-elisp";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "deech";
@@ -42475,6 +44112,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "shift-number";
+        ename = "shift-number";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "alezost";
@@ -42499,6 +44137,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "shm";
+        ename = "shm";
         version = "1.0.20";
         src = fetchFromGitHub {
           owner = "chrisdone";
@@ -42523,6 +44162,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "showtip";
+        ename = "showtip";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -42547,6 +44187,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "shpec-mode";
+        ename = "shpec-mode";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "shpec";
@@ -42573,6 +44214,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "shr-tag-pre-highlight";
+        ename = "shr-tag-pre-highlight";
         version = "2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -42600,6 +44242,7 @@
                                , s }:
       melpaBuild {
         pname = "shrink-path";
+        ename = "shrink-path";
         version = "0.3.1";
         src = fetchFromGitLab {
           owner = "bennya";
@@ -42624,6 +44267,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "shrink-whitespace";
+        ename = "shrink-whitespace";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "jcpetkovich";
@@ -42650,6 +44294,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "shut-up";
+        ename = "shut-up";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "cask";
@@ -42675,6 +44320,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "shx";
+        ename = "shx";
         version = "0.0.16";
         src = fetchFromGitHub {
           owner = "riscy";
@@ -42700,6 +44346,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "side-notes";
+        ename = "side-notes";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "rnkn";
@@ -42724,6 +44371,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "sift";
+        ename = "sift";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -42749,6 +44397,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "silkworm-theme";
+        ename = "silkworm-theme";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "mswift42";
@@ -42774,6 +44423,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "simple-bookmarks";
+        ename = "simple-bookmarks";
         version = "1.8";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
@@ -42799,6 +44449,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "simple-httpd";
+        ename = "simple-httpd";
         version = "1.5.1";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -42823,6 +44474,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "simpleclip";
+        ename = "simpleclip";
         version = "1.0.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -42848,6 +44500,7 @@
                                , request-deferred }:
       melpaBuild {
         pname = "simplenote2";
+        ename = "simplenote2";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "alpha22jp";
@@ -42872,6 +44525,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "simplezen";
+        ename = "simplezen";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -42902,6 +44556,7 @@
                             , s }:
       melpaBuild {
         pname = "skeletor";
+        ename = "skeletor";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
@@ -42927,6 +44582,7 @@
                                , skewer-mode }:
       melpaBuild {
         pname = "skewer-less";
+        ename = "skewer-less";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -42954,6 +44610,7 @@
                                , simple-httpd }:
       melpaBuild {
         pname = "skewer-mode";
+        ename = "skewer-mode";
         version = "1.8.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -42979,6 +44636,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "sl";
+        ename = "sl";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -43003,6 +44661,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "slideview";
+        ename = "slideview";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -43027,6 +44686,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "slim-mode";
+        ename = "slim-mode";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "slim-template";
@@ -43053,12 +44713,13 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "slime";
-        version = "2.21";
+        ename = "slime";
+        version = "2.22";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "e6d215d77148079799d2fc3253ef402b5d9ed4d7";
-          sha256 = "1zgbl5462zpgqrrk87k0w5a4c99hr99kn33jsrs2x37jmzirsxfn";
+          rev = "8d9fdf34fe542ec280ee042ee7bdea16e512d3c0";
+          sha256 = "0zsliqfd92ivg2y2w1z6scn6i3w658x8bi1wd0rvf6mddc74lvj6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -43079,6 +44740,7 @@
                                  , slime }:
       melpaBuild {
         pname = "slime-company";
+        ename = "slime-company";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "anwyn";
@@ -43107,6 +44769,7 @@
                                 , slime }:
       melpaBuild {
         pname = "slime-docker";
+        ename = "slime-docker";
         version = "0.7";
         src = fetchFromGitHub {
           owner = "daewok";
@@ -43131,6 +44794,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "slime-volleyball";
+        ename = "slime-volleyball";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "fitzsim";
@@ -43157,6 +44821,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "slstats";
+        ename = "slstats";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "davep";
@@ -43181,6 +44846,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "sly";
+        ename = "sly";
         version = "2.14";
         src = fetchFromGitHub {
           owner = "capitaomorte";
@@ -43207,6 +44873,7 @@
                                    , rich-minority }:
       melpaBuild {
         pname = "smart-mode-line";
+        ename = "smart-mode-line";
         version = "2.11.0";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -43234,6 +44901,7 @@
                                                    , smart-mode-line }:
       melpaBuild {
         pname = "smart-mode-line-powerline-theme";
+        ename = "smart-mode-line-powerline-theme";
         version = "2.11.0";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -43259,6 +44927,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "smart-semicolon";
+        ename = "smart-semicolon";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "iquiw";
@@ -43283,6 +44952,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "smart-tabs-mode";
+        ename = "smart-tabs-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "jcsalomon";
@@ -43309,6 +44979,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "smartparens";
+        ename = "smartparens";
         version = "1.11.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -43333,6 +45004,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "smartrep";
+        ename = "smartrep";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "myuhe";
@@ -43357,6 +45029,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "smartscan";
+        ename = "smartscan";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "mickeynp";
@@ -43381,6 +45054,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "smbc";
+        ename = "smbc";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "sakshamsharma";
@@ -43406,6 +45080,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "smeargle";
+        ename = "smeargle";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43430,6 +45105,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "smex";
+        ename = "smex";
         version = "3.0";
         src = fetchFromGitHub {
           owner = "nonsequitur";
@@ -43454,6 +45130,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "smmry";
+        ename = "smmry";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "microamp";
@@ -43478,6 +45155,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "smooth-scroll";
+        ename = "smooth-scroll";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "k-talo";
@@ -43502,6 +45180,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "smooth-scrolling";
+        ename = "smooth-scrolling";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "aspiers";
@@ -43529,6 +45208,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "snakemake-mode";
+        ename = "snakemake-mode";
         version = "1.3.0";
         src = fetchFromGitHub {
           owner = "kyleam";
@@ -43555,6 +45235,7 @@
                                                   , snapshot-timemachine }:
       melpaBuild {
         pname = "snapshot-timemachine-rsnapshot";
+        ename = "snapshot-timemachine-rsnapshot";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -43581,6 +45262,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "snazzy-theme";
+        ename = "snazzy-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "weijiangan";
@@ -43607,6 +45289,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "snoopy";
+        ename = "snoopy";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "anmonteiro";
@@ -43635,6 +45318,7 @@
                          , s }:
       melpaBuild {
         pname = "socyl";
+        ename = "socyl";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -43661,6 +45345,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "solaire-mode";
+        ename = "solaire-mode";
         version = "1.0.6";
         src = fetchFromGitHub {
           owner = "hlissner";
@@ -43686,6 +45371,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "solarized-theme";
+        ename = "solarized-theme";
         version = "1.2.2";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -43710,6 +45396,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "solidity-mode";
+        ename = "solidity-mode";
         version = "0.1.9";
         src = fetchFromGitHub {
           owner = "ethereum";
@@ -43735,6 +45422,7 @@
                        , org }:
       melpaBuild {
         pname = "sos";
+        ename = "sos";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "omouse";
@@ -43763,6 +45451,7 @@
                               , sotlisp }:
       melpaBuild {
         pname = "sotclojure";
+        ename = "sotclojure";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -43788,6 +45477,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "sotlisp";
+        ename = "sotlisp";
         version = "1.6.2";
         src = fetchFromGitHub {
           owner = "Malabarba";
@@ -43814,6 +45504,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sound-wav";
+        ename = "sound-wav";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43842,6 +45533,7 @@
                              , request }:
       melpaBuild {
         pname = "sourcekit";
+        ename = "sourcekit";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "nathankot";
@@ -43867,6 +45559,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sourcemap";
+        ename = "sourcemap";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -43896,6 +45589,7 @@
                              , s }:
       melpaBuild {
         pname = "spaceline";
+        ename = "spaceline";
         version = "2.0.1";
         src = fetchFromGitHub {
           owner = "TheBB";
@@ -43924,6 +45618,7 @@
                                            , spaceline }:
       melpaBuild {
         pname = "spaceline-all-the-icons";
+        ename = "spaceline-all-the-icons";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "domtronn";
@@ -43949,6 +45644,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sparkline";
+        ename = "sparkline";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "woudshoo";
@@ -43975,6 +45671,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sparql-mode";
+        ename = "sparql-mode";
         version = "4.0.2";
         src = fetchFromGitHub {
           owner = "ljos";
@@ -43999,6 +45696,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "speech-tagger";
+        ename = "speech-tagger";
         version = "0.0.0";
         src = fetchFromGitHub {
           owner = "cosmicexplorer";
@@ -44024,6 +45722,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "speed-type";
+        ename = "speed-type";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "parkouss";
@@ -44050,6 +45749,7 @@
                               , s }:
       melpaBuild {
         pname = "sphinx-doc";
+        ename = "sphinx-doc";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "naiquevin";
@@ -44074,6 +45774,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sphinx-mode";
+        ename = "sphinx-mode";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -44099,6 +45800,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "splitjoin";
+        ename = "splitjoin";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -44124,6 +45826,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "spotify";
+        ename = "spotify";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "remvee";
@@ -44149,6 +45852,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "sprintly-mode";
+        ename = "sprintly-mode";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "sprintly";
@@ -44175,6 +45879,7 @@
                            , request }:
       melpaBuild {
         pname = "sprunge";
+        ename = "sprunge";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "tomjakubowski";
@@ -44199,6 +45904,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "sql-impala";
+        ename = "sql-impala";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "jterk";
@@ -44223,6 +45929,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "sqlup-mode";
+        ename = "sqlup-mode";
         version = "0.8.0";
         src = fetchFromGitHub {
           owner = "Trevoke";
@@ -44247,6 +45954,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "sr-speedbar";
+        ename = "sr-speedbar";
         version = "20140914.2339";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -44271,6 +45979,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "srcery-theme";
+        ename = "srcery-theme";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "srcery-colors";
@@ -44296,6 +46005,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "srefactor";
+        ename = "srefactor";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "tuhdo";
@@ -44321,6 +46031,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssass-mode";
+        ename = "ssass-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -44347,6 +46058,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssh-agency";
+        ename = "ssh-agency";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "magit";
@@ -44372,12 +46084,13 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "ssh-deploy";
+        ename = "ssh-deploy";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "b17f543fe56947d472659675de53757e29ad2fc0";
-          sha256 = "1c78qf589vxs45l0d6s4w9ng9nd4k60shj3bz8mxn7038kch2pb4";
+          rev = "b13ba60ea175798cfd1395ab833082789724073d";
+          sha256 = "0fgcxvs2ngv65chnkb9w5rrak187xkwxiwmpc25iqvrrnrfr43s6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -44396,6 +46109,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "stan-mode";
+        ename = "stan-mode";
         version = "9.2.0";
         src = fetchFromGitHub {
           owner = "stan-dev";
@@ -44422,6 +46136,7 @@
                                  , yasnippet }:
       melpaBuild {
         pname = "stan-snippets";
+        ename = "stan-snippets";
         version = "9.2.0";
         src = fetchFromGitHub {
           owner = "stan-dev";
@@ -44446,6 +46161,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "stash";
+        ename = "stash";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -44470,6 +46186,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "status";
+        ename = "status";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "tromey";
@@ -44494,6 +46211,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "stgit";
+        ename = "stgit";
         version = "0.18";
         src = fetchFromGitHub {
           owner = "ctmarinas";
@@ -44519,6 +46237,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "string-edit";
+        ename = "string-edit";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -44543,6 +46262,7 @@
                                      , melpaBuild }:
       melpaBuild {
         pname = "string-inflection";
+        ename = "string-inflection";
         version = "1.0.7";
         src = fetchFromGitHub {
           owner = "akicho8";
@@ -44568,6 +46288,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "string-utils";
+        ename = "string-utils";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -44593,6 +46314,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "stripe-buffer";
+        ename = "stripe-buffer";
         version = "0.2.5";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -44617,6 +46339,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "stumpwm-mode";
+        ename = "stumpwm-mode";
         version = "0.9.8";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/stumpwm.git";
@@ -44641,6 +46364,7 @@
                                , sws-mode }:
       melpaBuild {
         pname = "stylus-mode";
+        ename = "stylus-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -44665,6 +46389,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "subatomic-theme";
+        ename = "subatomic-theme";
         version = "1.8.1";
         src = fetchFromGitHub {
           owner = "cryon";
@@ -44689,6 +46414,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "subemacs";
+        ename = "subemacs";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "kbauer";
@@ -44713,6 +46439,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sublimity";
+        ename = "sublimity";
         version = "20160629";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -44737,6 +46464,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "sudden-death";
+        ename = "sudden-death";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "yewton";
@@ -44763,6 +46491,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "sudo-edit";
+        ename = "sudo-edit";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "nflath";
@@ -44789,22 +46518,24 @@
                            , lib
                            , loop
                            , melpaBuild
-                           , s }:
+                           , s
+                           , spinner }:
       melpaBuild {
         pname = "suggest";
-        version = "0.5";
+        ename = "suggest";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "05beef9ecf94107d72d0070fa092a8392505b012";
-          sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a";
+          rev = "31ab6c956d17176affbbe9ca53c416920180ddbd";
+          sha256 = "01v8plska5d3g19sb1m4ph1i3ayprfzk8mi6mpabjy6zad397xjl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
           sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f loop s ];
+        packageRequires = [ dash emacs f loop s spinner ];
         meta = {
           homepage = "https://melpa.org/#/suggest";
           license = lib.licenses.free;
@@ -44816,6 +46547,7 @@
                                          , melpaBuild }:
       melpaBuild {
         pname = "suomalainen-kalenteri";
+        ename = "suomalainen-kalenteri";
         version = "2017.8.1";
         src = fetchFromGitHub {
           owner = "tlikonen";
@@ -44841,6 +46573,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "super-save";
+        ename = "super-save";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -44866,6 +46599,7 @@
                                         , xmlgen }:
       melpaBuild {
         pname = "svg-mode-line-themes";
+        ename = "svg-mode-line-themes";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "sabof";
@@ -44893,6 +46627,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "swagger-to-org";
+        ename = "swagger-to-org";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "ahungry";
@@ -44921,6 +46656,7 @@
                               , request }:
       melpaBuild {
         pname = "sweetgreen";
+        ename = "sweetgreen";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "CestDiego";
@@ -44947,12 +46683,13 @@
                               , seq }:
       melpaBuild {
         pname = "swift-mode";
-        version = "5.0.0";
+        ename = "swift-mode";
+        version = "6.0.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "7ea1d4e3b0430644b2e2b2e1025f442a10bfa523";
-          sha256 = "179wiwdxpkw7kbx2yss193l68cbmy93xdabw5sm35mv8px809j17";
+          rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080";
+          sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -44972,6 +46709,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "swift3-mode";
+        ename = "swift3-mode";
         version = "2.1.1";
         src = fetchFromGitHub {
           owner = "taku0";
@@ -44998,6 +46736,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "swiper";
+        ename = "swiper";
         version = "0.10.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -45025,6 +46764,7 @@
                                , swiper }:
       melpaBuild {
         pname = "swiper-helm";
+        ename = "swiper-helm";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -45049,6 +46789,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "switch-buffer-functions";
+        ename = "switch-buffer-functions";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -45074,6 +46815,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "switch-window";
+        ename = "switch-window";
         version = "1.6.1";
         src = fetchFromGitHub {
           owner = "dimitri";
@@ -45098,6 +46840,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "sws-mode";
+        ename = "sws-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "brianc";
@@ -45127,6 +46870,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "sx";
+        ename = "sx";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "vermiculus";
@@ -45151,6 +46895,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "symbolword-mode";
+        ename = "symbolword-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "ncaq";
@@ -45175,6 +46920,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "symon";
+        ename = "symon";
         version = "20160630";
         src = fetchFromGitHub {
           owner = "zk-phi";
@@ -45200,6 +46946,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "syndicate";
+        ename = "syndicate";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "KNX32542";
@@ -45225,6 +46972,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "synosaurus";
+        ename = "synosaurus";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "hpdeifel";
@@ -45249,6 +46997,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "syntactic-sugar";
+        ename = "syntactic-sugar";
         version = "0.9.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -45279,7 +47028,7 @@
           rev = "ad0db0fcb464";
           sha256 = "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
@@ -45297,6 +47046,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "system-packages";
+        ename = "system-packages";
         version = "1.0.5";
         src = fetchFromGitLab {
           owner = "jabranham";
@@ -45321,6 +47071,7 @@
                                             , melpaBuild }:
       melpaBuild {
         pname = "system-specific-settings";
+        ename = "system-specific-settings";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -45346,6 +47097,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "systemd";
+        ename = "systemd";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "holomorph";
@@ -45372,6 +47124,7 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "ta";
+        ename = "ta";
         version = "1.5";
         src = fetchFromGitHub {
           owner = "kuanyui";
@@ -45397,6 +47150,7 @@
                                 , tabbar }:
       melpaBuild {
         pname = "tabbar-ruler";
+        ename = "tabbar-ruler";
         version = "0.45";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -45422,6 +47176,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "tablist";
+        ename = "tablist";
         version = "0.70";
         src = fetchFromGitHub {
           owner = "politza";
@@ -45448,6 +47203,7 @@
                            , s }:
       melpaBuild {
         pname = "tagedit";
+        ename = "tagedit";
         version = "1.4.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -45474,6 +47230,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "tawny-mode";
+        ename = "tawny-mode";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "phillord";
@@ -45498,6 +47255,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "tdd-status-mode-line";
+        ename = "tdd-status-mode-line";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "algernon";
@@ -45522,6 +47280,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "telepathy";
+        ename = "telepathy";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -45550,6 +47309,7 @@
                                   , seq }:
       melpaBuild {
         pname = "telephone-line";
+        ename = "telephone-line";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "dbordak";
@@ -45575,6 +47335,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "ten-hundred-mode";
+        ename = "ten-hundred-mode";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "aaron-em";
@@ -45603,6 +47364,7 @@
                               , term-cmd }:
       melpaBuild {
         pname = "term-alert";
+        ename = "term-alert";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "CallumCameron";
@@ -45630,6 +47392,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "term-cmd";
+        ename = "term-cmd";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "CallumCameron";
@@ -45656,6 +47419,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "term-manager";
+        ename = "term-manager";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -45682,6 +47446,7 @@
                                    , term-manager }:
       melpaBuild {
         pname = "term-projectile";
+        ename = "term-projectile";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "IvanMalison";
@@ -45706,6 +47471,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "term-run";
+        ename = "term-run";
         version = "0.1.5";
         src = fetchFromGitHub {
           owner = "10sr";
@@ -45731,6 +47497,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "termbright-theme";
+        ename = "termbright-theme";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "bmastenbrook";
@@ -45757,6 +47524,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "terminal-here";
+        ename = "terminal-here";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
@@ -45784,6 +47552,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "tern";
+        ename = "tern";
         version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
@@ -45812,6 +47581,7 @@
                                       , tern }:
       melpaBuild {
         pname = "tern-auto-complete";
+        ename = "tern-auto-complete";
         version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
@@ -45839,6 +47609,7 @@
                                          , tern }:
       melpaBuild {
         pname = "tern-context-coloring";
+        ename = "tern-context-coloring";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
@@ -45866,6 +47637,7 @@
                                , tern }:
       melpaBuild {
         pname = "tern-django";
+        ename = "tern-django";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "proofit404";
@@ -45892,6 +47664,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "terraform-mode";
+        ename = "terraform-mode";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -45917,6 +47690,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "test-case-mode";
+        ename = "test-case-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "ieure";
@@ -45941,6 +47715,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "test-kitchen";
+        ename = "test-kitchen";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "jjasghar";
@@ -45965,6 +47740,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "test-simple";
+        ename = "test-simple";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "rocky";
@@ -45989,6 +47765,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "textmate";
+        ename = "textmate";
         version = "1";
         src = fetchFromGitHub {
           owner = "defunkt";
@@ -46013,6 +47790,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "textmate-to-yas";
+        ename = "textmate-to-yas";
         version = "0.21";
         src = fetchFromGitHub {
           owner = "mattfidler";
@@ -46038,6 +47816,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "textx-mode";
+        ename = "textx-mode";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "novakboskov";
@@ -46062,6 +47841,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "theme-changer";
+        ename = "theme-changer";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "hadronzoo";
@@ -46087,6 +47867,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "theme-looper";
+        ename = "theme-looper";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "myTerminal";
@@ -46112,6 +47893,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "thinks";
+        ename = "thinks";
         version = "1.12";
         src = fetchFromGitHub {
           owner = "davep";
@@ -46136,6 +47918,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "thrift";
+        ename = "thrift";
         version = "0.11.0";
         src = fetchFromGitHub {
           owner = "apache";
@@ -46161,6 +47944,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "tickscript-mode";
+        ename = "tickscript-mode";
         version = "0.4.1";
         src = fetchFromGitHub {
           owner = "msherry";
@@ -46187,6 +47971,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "tidal";
+        ename = "tidal";
         version = "0.9.8";
         src = fetchFromGitHub {
           owner = "tidalcycles";
@@ -46216,6 +48001,7 @@
                         , typescript-mode }:
       melpaBuild {
         pname = "tide";
+        ename = "tide";
         version = "2.8.3.1";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -46240,6 +48026,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "timer-revert";
+        ename = "timer-revert";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "yyr";
@@ -46267,6 +48054,7 @@
                              , s }:
       melpaBuild {
         pname = "timesheet";
+        ename = "timesheet";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "tmarble";
@@ -46297,6 +48085,7 @@
                             , s }:
       melpaBuild {
         pname = "timonier";
+        ename = "timonier";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -46321,6 +48110,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "toc-org";
+        ename = "toc-org";
         version = "1.0.1";
         src = fetchFromGitHub {
           owner = "snosov1";
@@ -46346,6 +48136,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "total-lines";
+        ename = "total-lines";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "hinrik";
@@ -46370,6 +48161,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "tox";
+        ename = "tox";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "chmouel";
@@ -46401,7 +48193,7 @@
           rev = "b322fc7497a5";
           sha256 = "1pnsky541m8kzcv81w98jkv0hgajh04hxqlmgddc1y0wbvi849j0";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
@@ -46424,6 +48216,7 @@
                          , virtualenvwrapper }:
       melpaBuild {
         pname = "traad";
+        ename = "traad";
         version = "3.1.1";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -46455,6 +48248,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tracking";
+        ename = "tracking";
         version = "2.10";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -46481,6 +48275,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "transmission";
+        ename = "transmission";
         version = "0.12.1";
         src = fetchFromGitHub {
           owner = "holomorph";
@@ -46509,6 +48304,7 @@
                           , s }:
       melpaBuild {
         pname = "travis";
+        ename = "travis";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
@@ -46542,6 +48338,7 @@
                             , s }:
       melpaBuild {
         pname = "treemacs";
+        ename = "treemacs";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -46568,6 +48365,7 @@
                                  , treemacs }:
       melpaBuild {
         pname = "treemacs-evil";
+        ename = "treemacs-evil";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -46594,6 +48392,7 @@
                                        , treemacs }:
       melpaBuild {
         pname = "treemacs-projectile";
+        ename = "treemacs-projectile";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
@@ -46619,6 +48418,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "treepy";
+        ename = "treepy";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "volrath";
@@ -46643,6 +48443,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "trr";
+        ename = "trr";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "kawabata";
@@ -46668,6 +48469,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "truthy";
+        ename = "truthy";
         version = "0.2.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -46693,6 +48495,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "try";
+        ename = "try";
         version = "0.0.1";
         src = fetchFromGitHub {
           owner = "larstvei";
@@ -46721,6 +48524,7 @@
                        , yaxception }:
       melpaBuild {
         pname = "tss";
+        ename = "tss";
         version = "0.6.0";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -46746,6 +48550,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tuareg";
+        ename = "tuareg";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "ocaml";
@@ -46770,6 +48575,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "tumble";
+        ename = "tumble";
         version = "1.5";
         src = fetchFromGitHub {
           owner = "febuiles";
@@ -46794,6 +48600,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "tup-mode";
+        ename = "tup-mode";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "ejmr";
@@ -46819,6 +48626,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "turing-machine";
+        ename = "turing-machine";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "therockmandolinist";
@@ -46843,6 +48651,7 @@
                                               , melpaBuild }:
       melpaBuild {
         pname = "twilight-anti-bright-theme";
+        ename = "twilight-anti-bright-theme";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "jimeh";
@@ -46867,6 +48676,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "twittering-mode";
+        ename = "twittering-mode";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "hayamiz";
@@ -46893,6 +48703,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "typed-clojure-mode";
+        ename = "typed-clojure-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "typedclojure";
@@ -46917,6 +48728,7 @@
                                    , melpaBuild }:
       melpaBuild {
         pname = "typescript-mode";
+        ename = "typescript-mode";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
@@ -46944,6 +48756,7 @@
                          , mmt }:
       melpaBuild {
         pname = "typit";
+        ename = "typit";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -46968,6 +48781,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "typo";
+        ename = "typo";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
@@ -46992,6 +48806,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "ubuntu-theme";
+        ename = "ubuntu-theme";
         version = "4.2";
         src = fetchFromGitHub {
           owner = "rocher";
@@ -47019,6 +48834,7 @@
                              , persistent-soft }:
       melpaBuild {
         pname = "ucs-utils";
+        ename = "ucs-utils";
         version = "0.8.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47046,6 +48862,7 @@
                               , shut-up }:
       melpaBuild {
         pname = "undercover";
+        ename = "undercover";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "sviridov";
@@ -47071,6 +48888,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "underline-with-char";
+        ename = "underline-with-char";
         version = "3.0.0";
         src = fetchFromGitHub {
           owner = "marcowahl";
@@ -47095,6 +48913,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "underwater-theme";
+        ename = "underwater-theme";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "jmdeldin";
@@ -47119,6 +48938,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "unfill";
+        ename = "unfill";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -47147,6 +48967,7 @@
                                  , ucs-utils }:
       melpaBuild {
         pname = "unicode-enbox";
+        ename = "unicode-enbox";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47174,6 +48995,7 @@
                                   , names }:
       melpaBuild {
         pname = "unicode-escape";
+        ename = "unicode-escape";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -47203,6 +49025,7 @@
                                  , ucs-utils }:
       melpaBuild {
         pname = "unicode-fonts";
+        ename = "unicode-fonts";
         version = "0.4.8";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47237,6 +49060,7 @@
                                              , ucs-utils }:
       melpaBuild {
         pname = "unicode-progress-reporter";
+        ename = "unicode-progress-reporter";
         version = "0.5.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47264,6 +49088,7 @@
                                       , ucs-utils }:
       melpaBuild {
         pname = "unicode-whitespace";
+        ename = "unicode-whitespace";
         version = "0.2.4";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47289,6 +49114,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "unify-opening";
+        ename = "unify-opening";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -47313,6 +49139,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "unkillable-scratch";
+        ename = "unkillable-scratch";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "EricCrosson";
@@ -47339,6 +49166,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "uptimes";
+        ename = "uptimes";
         version = "3.6";
         src = fetchFromGitHub {
           owner = "davep";
@@ -47365,6 +49193,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "use-package";
+        ename = "use-package";
         version = "2.3";
         src = fetchFromGitHub {
           owner = "jwiegley";
@@ -47390,6 +49219,7 @@
                                       , use-package }:
       melpaBuild {
         pname = "use-package-el-get";
+        ename = "use-package-el-get";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "edvorg";
@@ -47415,6 +49245,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "usql";
+        ename = "usql";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "nickbarnwell";
@@ -47440,6 +49271,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "utop";
+        ename = "utop";
         version = "2.2.0";
         src = fetchFromGitHub {
           owner = "diml";
@@ -47467,6 +49299,7 @@
                              , request }:
       melpaBuild {
         pname = "v2ex-mode";
+        ename = "v2ex-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "aborn";
@@ -47491,6 +49324,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "vagrant";
+        ename = "vagrant";
         version = "0.6.1";
         src = fetchFromGitHub {
           owner = "ottbot";
@@ -47518,6 +49352,7 @@
                             , yaxception }:
       melpaBuild {
         pname = "vbasense";
+        ename = "vbasense";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -47544,6 +49379,7 @@
                           , popup }:
       melpaBuild {
         pname = "vc-msg";
+        ename = "vc-msg";
         version = "0.0.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
@@ -47568,6 +49404,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "vcomp";
+        ename = "vcomp";
         version = "0.3.1";
         src = fetchFromGitHub {
           owner = "tarsius";
@@ -47594,6 +49431,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "vdiff";
+        ename = "vdiff";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "justbur";
@@ -47621,12 +49459,13 @@
                                , vdiff }:
       melpaBuild {
         pname = "vdiff-magit";
-        version = "0.3.1";
+        ename = "vdiff-magit";
+        version = "0.3.2";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff-magit";
-          rev = "31019a8537241fe106ee270c0d757fdd87fde092";
-          sha256 = "0j2kpaql0j77r1yj31xbykg3jwipdy0rsps20sq50g2chljqfdpf";
+          rev = "7e841dc7225300dd4d5560faad04e5c44cd8b267";
+          sha256 = "0800lnclv0kdkk2njddhsydsbifrwgg6w09mm4js7mqci1mr3gia";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
@@ -47649,6 +49488,7 @@
                           , seq }:
       melpaBuild {
         pname = "vdirel";
+        ename = "vdirel";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
@@ -47673,6 +49513,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "vector-utils";
+        ename = "vector-utils";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -47698,6 +49539,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "vertigo";
+        ename = "vertigo";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "noctuid";
@@ -47726,6 +49568,7 @@
                               , outshine }:
       melpaBuild {
         pname = "vhdl-tools";
+        ename = "vhdl-tools";
         version = "5.9";
         src = fetchFromGitHub {
           owner = "csantosb";
@@ -47751,6 +49594,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "vim-region";
+        ename = "vim-region";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "ongaeshi";
@@ -47778,6 +49622,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "vimish-fold";
+        ename = "vimish-fold";
         version = "0.2.3";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -47804,6 +49649,7 @@
                                      , s }:
       melpaBuild {
         pname = "virtualenvwrapper";
+        ename = "virtualenvwrapper";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "porterjamesj";
@@ -47828,6 +49674,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "visible-mark";
+        ename = "visible-mark";
         version = "0.1";
         src = fetchFromGitLab {
           owner = "iankelling";
@@ -47853,6 +49700,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "visual-fill-column";
+        ename = "visual-fill-column";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -47878,6 +49726,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "visual-regexp";
+        ename = "visual-regexp";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "benma";
@@ -47903,6 +49752,7 @@
                                           , visual-regexp }:
       melpaBuild {
         pname = "visual-regexp-steroids";
+        ename = "visual-regexp-steroids";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "benma";
@@ -47927,6 +49777,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "vlf";
+        ename = "vlf";
         version = "1.7.1";
         src = fetchFromGitHub {
           owner = "m00natic";
@@ -47951,6 +49802,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "voca-builder";
+        ename = "voca-builder";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "yitang";
@@ -47975,6 +49827,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "volatile-highlights";
+        ename = "volatile-highlights";
         version = "1.11";
         src = fetchFromGitHub {
           owner = "k-talo";
@@ -47999,6 +49852,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "vue-html-mode";
+        ename = "vue-html-mode";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
@@ -48027,6 +49881,7 @@
                             , vue-html-mode }:
       melpaBuild {
         pname = "vue-mode";
+        ename = "vue-mode";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "CodeFalling";
@@ -48051,6 +49906,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "w32-browser";
+        ename = "w32-browser";
         version = "235";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
@@ -48077,6 +49933,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "wacspace";
+        ename = "wacspace";
         version = "0.4.2";
         src = fetchFromGitHub {
           owner = "shosti";
@@ -48104,6 +49961,7 @@
                            , s }:
       melpaBuild {
         pname = "wandbox";
+        ename = "wandbox";
         version = "0.6.4";
         src = fetchFromGitHub {
           owner = "kosh04";
@@ -48128,6 +49986,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "wc-goal-mode";
+        ename = "wc-goal-mode";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -48152,6 +50011,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wc-mode";
+        ename = "wc-mode";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -48176,6 +50036,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wcheck-mode";
+        ename = "wcheck-mode";
         version = "2016.1.30";
         src = fetchFromGitHub {
           owner = "tlikonen";
@@ -48202,6 +50063,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "weather-metno";
+        ename = "weather-metno";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "ruediger";
@@ -48226,6 +50088,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "web-beautify";
+        ename = "web-beautify";
         version = "0.3.2";
         src = fetchFromGitHub {
           owner = "yasuyk";
@@ -48250,6 +50113,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "web-completion-data";
+        ename = "web-completion-data";
         version = "0.2";
         src = fetchFromGitHub {
           owner = "osv";
@@ -48275,6 +50139,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "web-mode";
+        ename = "web-mode";
         version = "16";
         src = fetchFromGitHub {
           owner = "fxbois";
@@ -48301,6 +50166,7 @@
                                          , web-mode }:
       melpaBuild {
         pname = "web-mode-edit-element";
+        ename = "web-mode-edit-element";
         version = "2.1";
         src = fetchFromGitHub {
           owner = "jtkDvlp";
@@ -48326,6 +50192,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "web-search";
+        ename = "web-search";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -48353,6 +50220,7 @@
                             , request }:
       melpaBuild {
         pname = "webpaste";
+        ename = "webpaste";
         version = "2.1.0";
         src = fetchFromGitHub {
           owner = "etu";
@@ -48378,6 +50246,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "websocket";
+        ename = "websocket";
         version = "1.10";
         src = fetchFromGitHub {
           owner = "ahyatt";
@@ -48406,6 +50275,7 @@
                            , tracking }:
       melpaBuild {
         pname = "weechat";
+        ename = "weechat";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "the-kenny";
@@ -48430,6 +50300,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "weibo";
+        ename = "weibo";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "austin-----";
@@ -48454,6 +50325,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "wgrep";
+        ename = "wgrep";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -48479,6 +50351,7 @@
                              , wgrep }:
       melpaBuild {
         pname = "wgrep-ack";
+        ename = "wgrep-ack";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -48504,6 +50377,7 @@
                             , wgrep }:
       melpaBuild {
         pname = "wgrep-ag";
+        ename = "wgrep-ag";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -48529,6 +50403,7 @@
                               , wgrep }:
       melpaBuild {
         pname = "wgrep-helm";
+        ename = "wgrep-helm";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -48554,6 +50429,7 @@
                             , wgrep }:
       melpaBuild {
         pname = "wgrep-pt";
+        ename = "wgrep-pt";
         version = "2.1.10";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -48579,6 +50455,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "which-key";
+        ename = "which-key";
         version = "3.3.0";
         src = fetchFromGitHub {
           owner = "justbur";
@@ -48604,6 +50481,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "whitaker";
+        ename = "whitaker";
         version = "0.3";
         src = fetchFromGitHub {
           owner = "Fuco1";
@@ -48628,6 +50506,7 @@
                                            , melpaBuild }:
       melpaBuild {
         pname = "whitespace-cleanup-mode";
+        ename = "whitespace-cleanup-mode";
         version = "0.10";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -48653,6 +50532,7 @@
                                 , melpaBuild }:
       melpaBuild {
         pname = "whizzml-mode";
+        ename = "whizzml-mode";
         version = "0.3.0";
         src = fetchFromGitHub {
           owner = "whizzml";
@@ -48677,6 +50557,7 @@
                                         , melpaBuild }:
       melpaBuild {
         pname = "whole-line-or-region";
+        ename = "whole-line-or-region";
         version = "1.3.1";
         src = fetchFromGitHub {
           owner = "purcell";
@@ -48701,6 +50582,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "widget-mvc";
+        ename = "widget-mvc";
         version = "0.0.2";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -48727,6 +50609,7 @@
                             , nav-flash }:
       melpaBuild {
         pname = "wiki-nav";
+        ename = "wiki-nav";
         version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -48751,6 +50634,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "win-switch";
+        ename = "win-switch";
         version = "1.1.4";
         src = fetchFromGitHub {
           owner = "genovese";
@@ -48775,6 +50659,7 @@
                                       , melpaBuild }:
       melpaBuild {
         pname = "window-end-visible";
+        ename = "window-end-visible";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "rolandwalker";
@@ -48799,6 +50684,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "window-layout";
+        ename = "window-layout";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "kiwanami";
@@ -48823,6 +50709,7 @@
                                     , melpaBuild }:
       melpaBuild {
         pname = "window-numbering";
+        ename = "window-numbering";
         version = "1.1.2";
         src = fetchFromGitHub {
           owner = "nschum";
@@ -48851,6 +50738,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "window-purpose";
+        ename = "window-purpose";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "bmag";
@@ -48875,6 +50763,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "windsize";
+        ename = "windsize";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "grammati";
@@ -48899,6 +50788,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "winring";
+        ename = "winring";
         version = "5.1";
         src = fetchFromGitLab {
           owner = "warsaw";
@@ -48925,6 +50815,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "winum";
+        ename = "winum";
         version = "2.0.0";
         src = fetchFromGitHub {
           owner = "deb0ch";
@@ -48955,7 +50846,7 @@
           rev = "d04938232934";
           sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
@@ -48973,6 +50864,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wispjs-mode";
+        ename = "wispjs-mode";
         version = "0.2.0";
         src = fetchFromGitHub {
           owner = "krisajenkins";
@@ -48999,6 +50891,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "with-editor";
+        ename = "with-editor";
         version = "2.7.3";
         src = fetchFromGitHub {
           owner = "magit";
@@ -49026,6 +50919,7 @@
                                         , seq }:
       melpaBuild {
         pname = "with-simulated-input";
+        ename = "with-simulated-input";
         version = "2.2";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
@@ -49051,6 +50945,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wn-mode";
+        ename = "wn-mode";
         version = "1.4";
         src = fetchFromGitHub {
           owner = "luismbo";
@@ -49075,6 +50970,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wolfram";
+        ename = "wolfram";
         version = "1.1.1";
         src = fetchFromGitHub {
           owner = "hsjunnesson";
@@ -49103,6 +50999,7 @@
                               , multi }:
       melpaBuild {
         pname = "wonderland";
+        ename = "wonderland";
         version = "0.1.1";
         src = fetchFromGitHub {
           owner = "kurisuwhyte";
@@ -49129,6 +51026,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "wordgen";
+        ename = "wordgen";
         version = "0.1.4";
         src = fetchFromGitHub {
           owner = "Fanael";
@@ -49153,6 +51051,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "wordsmith-mode";
+        ename = "wordsmith-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "istib";
@@ -49180,6 +51079,7 @@
                         , swiper }:
       melpaBuild {
         pname = "worf";
+        ename = "worf";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
@@ -49205,6 +51105,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "wrap-region";
+        ename = "wrap-region";
         version = "0.7.3";
         src = fetchFromGitHub {
           owner = "rejeep";
@@ -49229,6 +51130,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "writegood-mode";
+        ename = "writegood-mode";
         version = "2.0.3";
         src = fetchFromGitHub {
           owner = "bnbeckwith";
@@ -49255,6 +51157,7 @@
                                   , visual-fill-column }:
       melpaBuild {
         pname = "writeroom-mode";
+        ename = "writeroom-mode";
         version = "3.7";
         src = fetchFromGitHub {
           owner = "joostkremers";
@@ -49279,6 +51182,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "ws-butler";
+        ename = "ws-butler";
         version = "0.6";
         src = fetchFromGitHub {
           owner = "lewang";
@@ -49303,6 +51207,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "wsd-mode";
+        ename = "wsd-mode";
         version = "0.5.0";
         src = fetchFromGitHub {
           owner = "josteink";
@@ -49329,6 +51234,7 @@
                           , xterm-color }:
       melpaBuild {
         pname = "wttrin";
+        ename = "wttrin";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "bcbcarl";
@@ -49355,6 +51261,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "x86-lookup";
+        ename = "x86-lookup";
         version = "1.2.0";
         src = fetchFromGitHub {
           owner = "skeeto";
@@ -49379,6 +51286,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xbm-life";
+        ename = "xbm-life";
         version = "0.1.3";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -49404,6 +51312,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "xcode-project";
+        ename = "xcode-project";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "nhojb";
@@ -49428,6 +51337,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "xcscope";
+        ename = "xcscope";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "dkogan";
@@ -49453,6 +51363,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "xkcd";
+        ename = "xkcd";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "vibhavp";
@@ -49477,6 +51388,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "xml-rpc";
+        ename = "xml-rpc";
         version = "1.6.12";
         src = fetchFromGitHub {
           owner = "hexmode";
@@ -49501,6 +51413,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "xmlgen";
+        ename = "xmlgen";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "philjackson";
@@ -49525,6 +51438,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "xquery-tool";
+        ename = "xquery-tool";
         version = "0.1.10";
         src = fetchFromGitHub {
           owner = "paddymcall";
@@ -49551,6 +51465,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "xref-js2";
+        ename = "xref-js2";
         version = "1.5";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -49576,6 +51491,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "xterm-color";
+        ename = "xterm-color";
         version = "1.7";
         src = fetchFromGitHub {
           owner = "atomontage";
@@ -49601,6 +51517,7 @@
                          , melpaBuild }:
       melpaBuild {
         pname = "xtest";
+        ename = "xtest";
         version = "1.1.0";
         src = fetchFromGitHub {
           owner = "promethial";
@@ -49625,6 +51542,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yafolding";
+        ename = "yafolding";
         version = "0.4.0";
         src = fetchFromGitHub {
           owner = "zenozeng";
@@ -49650,6 +51568,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "yagist";
+        ename = "yagist";
         version = "0.8.12";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
@@ -49675,6 +51594,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yaml-mode";
+        ename = "yaml-mode";
         version = "0.0.13";
         src = fetchFromGitHub {
           owner = "yoshiki";
@@ -49699,6 +51619,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yang-mode";
+        ename = "yang-mode";
         version = "0.9.8";
         src = fetchFromGitHub {
           owner = "mbj4668";
@@ -49723,6 +51644,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yankpad";
+        ename = "yankpad";
         version = "1.6";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
@@ -49747,6 +51669,7 @@
                            , melpaBuild }:
       melpaBuild {
         pname = "yapfify";
+        ename = "yapfify";
         version = "0.0.6";
         src = fetchFromGitHub {
           owner = "JorisE";
@@ -49771,6 +51694,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yard-mode";
+        ename = "yard-mode";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "pd";
@@ -49796,6 +51720,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yarn-mode";
+        ename = "yarn-mode";
         version = "1.0";
         src = fetchFromGitHub {
           owner = "anachronic";
@@ -49820,6 +51745,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "yascroll";
+        ename = "yascroll";
         version = "0.1";
         src = fetchFromGitHub {
           owner = "m2ym";
@@ -49845,6 +51771,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "yasnippet";
+        ename = "yasnippet";
         version = "0.13.0";
         src = fetchFromGitHub {
           owner = "joaotavora";
@@ -49870,6 +51797,7 @@
                                       , yasnippet }:
       melpaBuild {
         pname = "yasnippet-snippets";
+        ename = "yasnippet-snippets";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
@@ -49896,6 +51824,7 @@
                               , yasnippet }:
       melpaBuild {
         pname = "yatemplate";
+        ename = "yatemplate";
         version = "3.0";
         src = fetchFromGitHub {
           owner = "mineo";
@@ -49926,7 +51855,7 @@
           rev = "af4601ee3c6a";
           sha256 = "1r0irbkg8c5aapd1i7il31wv2fmhi0bzspiy21k670m896jqx50p";
         };
-        recipeFile = fetchurl {
+        recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
           sha256 = "1qbqdsqf5s61hyyzx84csnby242n5sdcmcw55pa8r16j8kyzgrc0";
           name = "yatex";
@@ -49943,6 +51872,7 @@
                               , melpaBuild }:
       melpaBuild {
         pname = "yaxception";
+        ename = "yaxception";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "aki2o";
@@ -49976,6 +51906,7 @@
                         , s }:
       melpaBuild {
         pname = "ycmd";
+        ename = "ycmd";
         version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
@@ -50010,6 +51941,7 @@
                             , melpaBuild }:
       melpaBuild {
         pname = "ydk-mode";
+        ename = "ydk-mode";
         version = "1.0.0";
         src = fetchFromGitHub {
           owner = "jacksonrayhamilton";
@@ -50037,6 +51969,7 @@
                                 , s }:
       melpaBuild {
         pname = "yesql-ghosts";
+        ename = "yesql-ghosts";
         version = "0.1.0";
         src = fetchFromGitHub {
           owner = "magnars";
@@ -50061,6 +51994,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "yoshi-theme";
+        ename = "yoshi-theme";
         version = "6.1.0";
         src = fetchFromGitHub {
           owner = "ryuslash";
@@ -50089,6 +52023,7 @@
                                      , popup }:
       melpaBuild {
         pname = "youdao-dictionary";
+        ename = "youdao-dictionary";
         version = "0.4";
         src = fetchFromGitHub {
           owner = "xuchunyang";
@@ -50115,6 +52050,7 @@
                        , melpaBuild }:
       melpaBuild {
         pname = "zel";
+        ename = "zel";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
@@ -50139,6 +52075,7 @@
                                  , melpaBuild }:
       melpaBuild {
         pname = "zenburn-theme";
+        ename = "zenburn-theme";
         version = "2.5";
         src = fetchFromGitHub {
           owner = "bbatsov";
@@ -50164,6 +52101,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zephir-mode";
+        ename = "zephir-mode";
         version = "0.3.3";
         src = fetchFromGitHub {
           owner = "sergeyklay";
@@ -50191,6 +52129,7 @@
                                   , melpaBuild }:
       melpaBuild {
         pname = "zerodark-theme";
+        ename = "zerodark-theme";
         version = "4.5";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
@@ -50218,6 +52157,7 @@
                                        , melpaBuild }:
       melpaBuild {
         pname = "zombie-trellys-mode";
+        ename = "zombie-trellys-mode";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "david-christiansen";
@@ -50243,6 +52183,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "zone-nyan";
+        ename = "zone-nyan";
         version = "0.2.2";
         src = fetchFromGitHub {
           owner = "wasamasa";
@@ -50268,6 +52209,7 @@
                         , melpaBuild }:
       melpaBuild {
         pname = "zoom";
+        ename = "zoom";
         version = "0.2.1";
         src = fetchFromGitHub {
           owner = "cyrus-and";
@@ -50293,6 +52235,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zoom-window";
+        ename = "zoom-window";
         version = "0.5";
         src = fetchFromGitHub {
           owner = "syohex";
@@ -50318,6 +52261,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zop-to-char";
+        ename = "zop-to-char";
         version = "1.1";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
@@ -50342,6 +52286,7 @@
                           , melpaBuild }:
       melpaBuild {
         pname = "zotelo";
+        ename = "zotelo";
         version = "1.3";
         src = fetchFromGitHub {
           owner = "vspinu";
@@ -50367,6 +52312,7 @@
                          , request-deferred }:
       melpaBuild {
         pname = "zotxt";
+        ename = "zotxt";
         version = "0.1.34";
         src = fetchFromGitLab {
           owner = "egh";
@@ -50391,6 +52337,7 @@
                              , melpaBuild }:
       melpaBuild {
         pname = "zygospore";
+        ename = "zygospore";
         version = "0.0.3";
         src = fetchFromGitHub {
           owner = "LouisKottmann";
@@ -50418,6 +52365,7 @@
                                , melpaBuild }:
       melpaBuild {
         pname = "zzz-to-char";
+        ename = "zzz-to-char";
         version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
@@ -50436,4 +52384,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index c0febd803cc..f3b77c708a7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -108,6 +108,14 @@ self:
       # Expects bash to be at /bin/bash
       helm-rtags = markBroken super.helm-rtags;
 
+      # Build same version as Haskell package
+      hindent = super.hindent.overrideAttrs (attrs: {
+        version = external.hindent.version;
+        src = external.hindent.src;
+        packageRequires = [ self.haskell-mode ];
+        propagatedUserEnvPkgs = [ external.hindent ];
+      });
+
       # upstream issue: missing file header
       ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 54027073f01..32b6b703729 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -3,10 +3,11 @@
     org = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "org";
-        version = "20180716";
+        ename = "org";
+        version = "20180723";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20180716.tar";
-          sha256 = "0gr57nfdncnxrxxzw87ni5i6zjh1mdxl9h8pw96msh1c47xhpk2d";
+          url = "http://orgmode.org/elpa/org-20180723.tar";
+          sha256 = "1mcgnba16lpyh55zjx4rcbmpygcmdnjjzvgv1rx0c3kz1h5fgzf8";
         };
         packageRequires = [];
         meta = {
@@ -17,10 +18,11 @@
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "org-plus-contrib";
-        version = "20180716";
+        ename = "org-plus-contrib";
+        version = "20180723";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20180716.tar";
-          sha256 = "0j4r3bcy96kcaab7cv2a5qd0mv8ddkr1qlihijk79l9nhsh2y4hm";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20180723.tar";
+          sha256 = "1l34bagkm8mcyv5diprpbd4yjijkdvx1l54qpvi8bmvxjnzsm7mk";
         };
         packageRequires = [];
         meta = {
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 799f58e5b68..ed77e6f4b47 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }:
+{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }:
 
 with stdenv.lib;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];
-  buildInputs = [ gtk2 which file ];
+  buildInputs = [ gtk2 which file hicolor-icon-theme ];
 
   doCheck = true;
 
@@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
 
   patchPhase = "patchShebangs .";
 
-  # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
-  # It have no reasons to exist in a redistribuable package
-  postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   meta = {
     description = "Small and lightweight IDE";
     longDescription = ''
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index fcb977fe204..a0a14e89860 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -60,7 +60,7 @@ let
     '';
 
     postInstall = stdenv.lib.optionalString stdenv.isLinux ''
-      sed -i -e "s|'xsel|'${xsel}/bin/xsel|" $out/share/nvim/runtime/autoload/provider/clipboard.vim
+      sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim
     '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) ''
       install_name_tool -change libjemalloc.1.dylib \
                 ${jemalloc}/lib/libjemalloc.1.dylib \
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index ad04cab62f5..7a700e0956b 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,7 +1,7 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
 args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
+, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
 , vimPlugins
@@ -10,13 +10,27 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
 
-, wrapPythonDrv ? false
-
+, features          ? "huge" # One of tiny, small, normal, big or huge
+, wrapPythonDrv     ? false
+, guiSupport        ? config.vim.gui or "auto"
+, luaSupport        ? config.vim.lua or true
+, perlSupport       ? config.vim.perl or false      # Perl interpreter
+, pythonSupport     ? config.vim.python or true     # Python interpreter
+, rubySupport       ? config.vim.ruby or true       # Ruby interpreter
+, nlsSupport        ? config.vim.nls or false       # Enable NLS (gettext())
+, tclSupport        ? config.vim.tcl or false       # Include Tcl interpreter
+, multibyteSupport  ? config.vim.multibyte or false # Enable multibyte editing support
+, cscopeSupport     ? config.vim.cscope or true     # Enable cscope interface
+, netbeansSupport   ? config.netbeans or true       # Enable NetBeans integration support.
+, ximSupport        ? config.vim.xim or true        # less than 15KB, needed for deadkeys
+# 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
+, darwinSupport     ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support
+, ftNixSupport      ? config.vim.ftNix or true      # Add .nix filetype detection and minimal syntax highlighting support
 , ... }: with args;
 
 
 let
-  inherit (args.composableDerivation) composableDerivation edf;
   nixosRuntimepath = writeText "nixos-vimrc" ''
     set nocompatible
     syntax on
@@ -48,148 +62,110 @@ let
   '';
 
   common = callPackage ./common.nix {};
-in
-composableDerivation {
-} (fix: rec {
-
-    name = "vim_configurable-${version}";
-
-    inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
-
-    src = builtins.getAttr source {
-      "default" = common.src; # latest release
-
-      "vim-nox" =
-          {
-            # vim nox branch: client-server without X by uing sockets
-            # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; }
-            src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; });
-            name = "vim-nox-hg-2082fc3";
-            # END
-          }.src;
-      };
-
-    patches = [ ./cflags-prune.diff ];
-
-    configureFlags
-      = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
-
-    nativeBuildInputs = [ pkgconfig ];
-
-    buildInputs
-      = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
-          libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]);
-
-    # most interpreters aren't tested yet.. (see python for example how to do it)
-    flags = {
-        ftNix = {
-          patches = [ ./ft-nix-support.patch ];
-          preConfigure = ''
-            cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
-            cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
-            cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
-          '';
-        };
-      }
-      // edf {
-        name = "darwin";
-        enable = {
-          buildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
-          NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-            "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
-        };
-      } #Disable Darwin (macOS) support.
-      // edf { name = "xsmp"; } #Disable XSMP session management
-      // edf { name = "xsmp_interact"; } #Disable XSMP interaction
-      // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
-      // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
-
-      // edf {
-        name = "python";
-        feat = "python${if python ? isPy3 then "3" else ""}interp";
-        enable = {
-          buildInputs = [ python ];
-        } // lib.optionalAttrs wrapPythonDrv {
-          nativeBuildInputs = [ makeWrapper ];
-          postInstall = ''
-            wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
-          '';
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
-                "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib"
-                "--disable-python${if python ? isPy3 then "" else "3"}interp" ];
-        };
-      }
-
-      // edf { name = "tcl"; feat = "tclinterp"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter.
-      // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter.
-      // edf {
-        name = "lua";
-        feat = "luainterp";
-        enable = {
-          buildInputs = [lua];
-          configureFlags = [
-            "--with-lua-prefix=${args.lua}"
-            "--enable-luainterp"
-          ];
-        };
-      }
-      // edf { name = "cscope"; } #Include cscope interface.
-      // edf { name = "workshop"; } #Include Sun Visual Workshop support.
-      // edf { name = "netbeans"; } #Disable NetBeans integration support.
-      // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
-      // edf { name = "multibyte"; } #Include multibyte editing support.
-      // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
-      // edf { name = "xim"; } #Include XIM input support.
-      // edf { name = "fontset"; } #Include X fontset output support.
-      // edf { name = "acl"; } #Don't check for ACL support.
-      // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
-      // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
-      ;
-
-  cfg = {
-    luaSupport       = config.vim.lua or true;
-    pythonSupport    = config.vim.python or true;
-    rubySupport      = config.vim.ruby or true;
-    nlsSupport       = config.vim.nls or false;
-    tclSupport       = config.vim.tcl or false;
-    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 true; # less than 15KB, needed for deadkeys
-
-    # 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
-    darwinSupport    = stdenv.isDarwin && (config.vim.darwin or true);
-
-    # add .nix filetype detection and minimal syntax highlighting support
-    ftNixSupport     = config.vim.ftNix or true;
-  };
 
-  #--enable-gui=OPTS     X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon
-    /*
-      // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes
-      // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes
-      // edf "gnome_check" "gnome_check" { } #If GTK GUI, check for GNOME default=no
-      // edf "motif_check" "motif_check" { } #If auto-select GUI, check for Motif default=yes
-      // edf "athena_check" "athena_check" { } #If auto-select GUI, check for Athena default=yes
-      // edf "nextaw_check" "nextaw_check" { } #If auto-select GUI, check for neXtaw default=yes
-      // edf "carbon_check" "carbon_check" { } #If auto-select GUI, check for Carbon default=yes
-      // edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
-    */
+  isPython3 = python.isPy3 or false;
 
-  preInstall = ''
-    mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
-  '';
+in stdenv.mkDerivation rec {
+
+  name = "vim_configurable-${version}";
+
+  inherit (common) version postPatch hardeningDisable enableParallelBuilding meta;
 
-  postInstall = stdenv.lib.optionalString stdenv.isLinux ''
+  src = builtins.getAttr source {
+    "default" = common.src; # latest release
+
+    "vim-nox" =
+      {
+        # vim nox branch: client-server without X by uing sockets
+        # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; }
+        src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; });
+        name = "vim-nox-hg-2082fc3";
+        # END
+      }.src;
+  };
+
+  patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;
+
+  configureFlags = [
+    "--enable-gui=${guiSupport}"
+    "--with-features=${features}"
+    "--disable-xsmp"              # XSMP session management
+    "--disable-xsmp_interact"     # XSMP interaction
+    "--disable-workshop"          # Sun Visual Workshop support
+    "--disable-sniff"             # Sniff interface
+    "--disable-hangulinput"       # Hangul input support
+    "--disable-fontset"           # X fontset output support
+    "--disable-acl"               # ACL support
+    "--disable-gpm"               # GPM (Linux mouse daemon)
+    "--disable-mzschemeinterp"
+    "--disable-gtk_check"
+    "--disable-gtk2_check"
+    "--disable-gnome_check"
+    "--disable-motif_check"
+    "--disable-athena_check"
+    "--disable-nextaf_check"
+    "--disable-carbon_check"
+    "--disable-gtktest"
+  ]
+  ++ stdenv.lib.optionals luaSupport [
+    "--with-lua-prefix=${args.lua}"
+    "--enable-luainterp"
+  ]
+  ++ stdenv.lib.optionals pythonSupport [
+    "--enable-python${if isPython3 then "3" else ""}interp=yes"
+    "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"
+    "--disable-python${if (!isPython3) then "3" else ""}interp"
+  ]
+  ++ stdenv.lib.optional nlsSupport          "--enable-nls"
+  ++ stdenv.lib.optional perlSupport         "--enable-perlinterp"
+  ++ stdenv.lib.optional rubySupport         "--enable-rubyinterp"
+  ++ stdenv.lib.optional tclSupport          "--enable-tclinterp"
+  ++ stdenv.lib.optional multibyteSupport    "--enable-multibyte"
+  ++ stdenv.lib.optional cscopeSupport       "--enable-cscope"
+  ++ stdenv.lib.optional netbeansSupport     "--enable-netbeans"
+  ++ stdenv.lib.optional ximSupport          "--enable-xim";
+
+  nativeBuildInputs = [
+    pkgconfig
+  ]
+  ++ stdenv.lib.optional wrapPythonDrv makeWrapper
+  ++ stdenv.lib.optional nlsSupport gettext
+  ++ stdenv.lib.optional perlSupport perl
+  ;
+
+  buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
+    libXmu glib libICE ]
+    ++ (if guiSupport == "gtk3" then [gtk3] else [gtk2])
+    ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ]
+    ++ stdenv.lib.optional luaSupport lua
+    ++ stdenv.lib.optional pythonSupport python
+    ++ stdenv.lib.optional tclSupport tcl
+    ++ stdenv.lib.optional rubySupport ruby;
+
+  preConfigure = ''
+    '' + stdenv.lib.optionalString ftNixSupport ''
+      cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
+      cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
+      cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
+    '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString (darwinSupport && stdenv.isDarwin)
+    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+
+  postInstall = ''
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
     patchelf --set-rpath \
       "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \
       "$out"/bin/{vim,gvim}
 
     ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
+  '' + stdenv.lib.optionalString wrapPythonDrv ''
+    wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
+  '';
+
+  preInstall = ''
+    mkdir -p $out/share/applications $out/share/icons/{hicolor,locolor}/{16x16,32x32,48x48}/apps
   '';
 
   dontStrip = 1;
-})
+}
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index c23bf360daf..81948918a11 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -1,110 +1,94 @@
 args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
-, composableDerivation, lib, config, python, perl, tcl, ruby, qt4
+, lib, config, python, perl, tcl, ruby, qt4
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
-, libICE, ... }: with args;
+, libICE
+, lua
+, features
+, luaSupport       ? config.vim.lua or true
+, perlSupport      ? config.vim.perl or false      # Perl interpreter
+, pythonSupport    ? config.vim.python or true
+, rubySupport      ? config.vim.ruby or true
+, nlsSupport       ? config.vim.nls or false
+, tclSupport       ? config.vim.tcl or false
+, multibyteSupport ? config.vim.multibyte or false
+, cscopeSupport    ? config.vim.cscope or false
+, netbeansSupport  ? config.netbeans or true # eg envim is using it
+
+# 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
+, darwinSupport    ? stdenv.isDarwin && (config.vim.darwin or true)
+
+# add .nix filetype detection and minimal syntax highlighting support
+, ftNixSupport     ? config.vim.ftNix or true
+
+, ... }: with args;
 
 let tag = "20140827";
     sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2";
-in
+in {
 
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {
-} (fix: {
+  name = "qvim-7.4." + tag;
 
-    name = "qvim-7.4." + tag;
+  enableParallelBuilding = true; # test this
 
-    enableParallelBuilding = true; # test this
-
-    src = fetchgit {
-      url = https://bitbucket.org/equalsraf/vim-qt.git ;
-      rev = "refs/tags/package-" + tag;
-      inherit sha256;
-    };
-
-    # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
-    # to meta.platforms.unix
-    preConfigure = assert (! stdenv.isDarwin); "";
-
-    configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ];
-
-    nativeBuildInputs
-      = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau
-          libXmu libICE qt4];
-
-    # most interpreters aren't tested yet.. (see python for example how to do it)
-    flags = {
-        ftNix = {
-          # because we cd to src in the main patch phase, we can't just add this
-          # patch to the list, we have to apply it manually
-          postPatch = ''
-            cd runtime
-            patch -p2 < ${./ft-nix-support.patch}
-            cd ..
-          '';
-        };
-      }
-      // edf { name = "darwin"; } #Disable Darwin (macOS) support.
-      // edf { name = "xsmp"; } #Disable XSMP session management
-      // edf { name = "xsmp_interact"; } #Disable XSMP interaction
-      // edf { name = "mzscheme"; } #Include MzScheme interpreter.
-      // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter.
-
-      // edf {
-        name = "python";
-        feat = "pythoninterp";
-        enable = {
-          nativeBuildInputs = [ python ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-pythoninterp=yes"
-                "--with-python-config-dir=${python}/lib" ];
-        };
-      }
-
-      // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
-      // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
-      // edf {
-        name = "lua";
-        feat = "luainterp";
-        enable = {
-          nativeBuildInputs = [lua];
-          configureFlags = [
-            "--with-lua-prefix=${args.lua}"
-            "--enable-luainterp"
-          ];
-        };
-      }
-      // edf { name = "cscope"; } #Include cscope interface.
-      // edf { name = "workshop"; } #Include Sun Visual Workshop support.
-      // edf { name = "netbeans"; } #Disable NetBeans integration support.
-      // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
-      // edf { name = "multibyte"; } #Include multibyte editing support.
-      // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
-      // edf { name = "xim"; } #Include XIM input support.
-      // edf { name = "fontset"; } #Include X fontset output support.
-      // edf { name = "acl"; } #Don't check for ACL support.
-      // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
-      // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()).
-      ;
-
-  cfg = {
-    luaSupport       = config.vim.lua or true;
-    pythonSupport    = config.vim.python or true;
-    rubySupport      = config.vim.ruby or true;
-    nlsSupport       = config.vim.nls or false;
-    tclSupport       = config.vim.tcl or false;
-    multibyteSupport = config.vim.multibyte or false;
-    cscopeSupport    = config.vim.cscope or false;
-    netbeansSupport  = config.netbeans or true; # eg envim is using it
-
-    # 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
-    darwinSupport    = stdenv.isDarwin && (config.vim.darwin or true);
-
-    # add .nix filetype detection and minimal syntax highlighting support
-    ftNixSupport     = config.vim.ftNix or true;
+  src = fetchgit {
+    url = https://bitbucket.org/equalsraf/vim-qt.git;
+    rev = "refs/tags/package-" + tag;
+    inherit sha256;
   };
 
+  # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
+  # to meta.platforms.unix
+  preConfigure = assert (! stdenv.isDarwin); "";
+
+  configureFlags = [
+    "--with-vim-name=qvim"
+    "--enable-gui=qt"
+    "--with-features=${features}"
+    "--disable-xsmp"
+    "--disable-xsmp_interact"
+    "--disable-workshop"          # Sun Visual Workshop support
+    "--disable-sniff"             # Sniff interface
+    "--disable-hangulinput"       # Hangul input support
+    "--disable-fontset"           # X fontset output support
+    "--disable-acl"               # ACL support
+    "--disable-gpm"               # GPM (Linux mouse daemon)
+    "--disable-mzscheme"
+  ]
+  ++ stdenv.lib.optionals luaSupport [
+    "--with-lua-prefix=${lua}"
+    "--enable-luainterp"
+  ]
+  ++ stdenv.lib.optional pythonSupport      "--enable-pythoninterp"
+  ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib"
+  ++ stdenv.lib.optional nlsSupport         "--enable-nls"
+  ++ stdenv.lib.optional perlSupport        "--enable-perlinterp"
+  ++ stdenv.lib.optional rubySupport        "--enable-rubyinterp"
+  ++ stdenv.lib.optional tclSupport         "--enable-tcl"
+  ++ stdenv.lib.optional multibyteSupport   "--enable-multibyte"
+  ++ stdenv.lib.optional darwinSupport      "--enable-darwin"
+  ++ stdenv.lib.optional cscopeSupport      "--enable-cscope";
+
+  nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw
+    libXau libXmu libICE qt4
+  ]
+  ++ stdenv.lib.optional nlsSupport gettext
+  ++ stdenv.lib.optional perlSupport perl
+  ++ stdenv.lib.optional pythonSupport python
+  ++ stdenv.lib.optional tclSupport tcl
+  ++ stdenv.lib.optional rubySupport ruby
+  ++ stdenv.lib.optional luaSupport lua
+  ;
+
+  postPatch = ''
+  '' + stdenv.lib.optionalString ftNixSupport ''
+    # because we cd to src in the main patch phase, we can't just add this
+    # patch to the list, we have to apply it manually
+    cd runtime
+    patch -p2 < ${./ft-nix-support.patch}
+    cd ..
+  '';
+
   postInstall = stdenv.lib.optionalString stdenv.isLinux ''
     rpath=`patchelf --print-rpath $out/bin/qvim`;
     for i in $nativeBuildInputs; do
@@ -125,5 +109,5 @@ composableDerivation {
     maintainers = with maintainers; [ smironov ttuegel ];
     platforms   = platforms.linux;
   };
-})
+}
 
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 3e815642c17..7f16ce3596d 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -82,6 +82,11 @@ in
         --set-rpath "${rpath}" \
         $out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
 
+      patchelf \
+        --set-rpath "${rpath}" \
+        "$out/lib/vscode/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/\
+      keymapping.node"
+
       ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
     '';
 
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index ef63cb97a73..949dce7132b 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
 perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
-libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
+libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
 gtk-mac-integration }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
-      libxslt docbook_xsl libart_lgpl ]
+      libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
       ++ stdenv.lib.optional withGNOME libgnomeui
       ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
 
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
-  # It have no reasons to exist in a redistribuable package
-  postInstall = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
-
   meta = {
     description = "Gnome Diagram drawing software";
     homepage = http://live.gnome.org/Dia;
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index b4715902df1..df8ebee020c 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, barcode, gnome3, autoreconfHook
 , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
-, intltool, itstool, makeWrapper, pkgconfig
+, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme
 }:
 
 stdenv.mkDerivation rec {
@@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
     barcode gtk3 gtk-doc gnome3.yelp-tools
     gnome3.gnome-common gnome3.gsettings-desktop-schemas
     itstool libxml2 librsvg libe-book libtool
-    
+    hicolor-icon-theme
   ];
 
   preFixup = ''
-    rm "$out/share/icons/hicolor/icon-theme.cache"
     wrapProgram "$out/bin/glabels-3" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index a82f13ee409..f4d08195309 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,7 +2,7 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, potrace, cmake
+, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
 }:
 
 let
@@ -44,15 +44,13 @@ stdenv.mkDerivation rec {
     libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace
+    libvisio libcdr libexif potrace hicolor-icon-theme
   ];
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    # Make sure PyXML modules can be found at run-time.
-    rm -f "$out/share/icons/hicolor/icon-theme.cache"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  # Make sure PyXML modules can be found at run-time.
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
     install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
   '';
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 09da61f3464..8814e2d89c8 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -49,18 +49,18 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-05-09";
+  version = "2018-07-20";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
+    sha256 = "1vhjmysfra6dsbv35qbvsf76rhkj990lgns0k0gpbcrf47gsvx1n";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
+  cargoSha256 = "0rs2p4sik25ynx6ri2wlg8v6vrdmf10xxnw9f2aqyps9m038i9di";
 
   nativeBuildInputs = [
     cmake
@@ -87,7 +87,7 @@ in buildRustPackage rec {
     mkdir $out/Applications
     cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
   '' else ''
-    install -D Alacritty.desktop $out/share/applications/alacritty.desktop
+    install -D alacritty.desktop $out/share/applications/alacritty.desktop
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
   '') + ''
 
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch
index e0c7d6a7a67..7466fc2ca62 100644
--- a/pkgs/applications/misc/mupdf/darwin.patch
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@@ -21,7 +21,7 @@ diff --git a/Makerules b/Makerules
 -SYS_GLUT_CFLAGS :=
 -SYS_GLUT_LIBS := -lglut -lGL
 -
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
  HAVE_LIBCRYPTO := yes
  SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
 @@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
@@ -33,3 +33,15 @@ diff --git a/Makerules b/Makerules
  
  ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
  HAVE_X11 := yes
+diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
+index d58f7ba..808af18 100644
+--- a/platform/gl/gl-main.c
++++ b/platform/gl/gl-main.c
+@@ -16,6 +16,7 @@ void glutExit(void) {}
+ void glutMouseWheelFunc(void *fn) {}
+ void glutInitErrorFunc(void *fn) {}
+ void glutInitWarningFunc(void *fn) {}
++#define glutSetOption(X,Y)
+ #endif
+ 
+ enum
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
index 9ecf0da5806..8804e438b7e 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -1,72 +1,32 @@
-{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }:
+{ buildGo110Package, fetchzip, lib }:
 
-# When perkeep is updated all deps in the let block should be removed
-let
-  gopherjs = fetchFromGitHub {
-    owner = "gopherjs";
-    repo = "gopherjs";
-    # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45
-    rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7";
-    sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc";
-  };
-
-  gotool = fetchFromGitHub {
-    owner = "kisielk";
-    repo = "gotool";
-    rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
-    sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
-  };
-
-  gcimporter15 = fetchgit {
-    url = "https://go.googlesource.com/tools";
-    rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97";
-    sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n";
-  };
-
-in
-stdenv.mkDerivation rec {
+buildGo110Package rec {
   name = "perkeep-${version}";
-  version = "20170505";
+  version = "0.10.1";
 
   src = fetchzip {
-    url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip";
-    sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
+    url = "https://perkeep.org/dl/perkeep-${version}-src.zip";
+    sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422";
   };
 
-  # When perkeep is updated postPatch should be removed
-  postPatch = ''
-    rm -r ./vendor/github.com/gopherjs/gopherjs/
-    cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs
-    mkdir -p ./vendor/github.com/kisielk/
-    cp -a ${gotool} ./vendor/github.com/kisielk/gotool
-    mkdir -p ./vendor/golang.org/x/tools/go
-    cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15
-
-    substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \
-      --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"'
-
-    substituteInPlace ./make.go \
-      --replace "goVersionMinor  = '8'" "goVersionMinor  = '9'" \
-      --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'"
-  '';
-
-  buildInputs = [ git go ];
+  goPackagePath = "perkeep.org";
 
-  goPackagePath = "";
   buildPhase = ''
+    cd "$NIX_BUILD_TOP/go/src/$goPackagePath"
     go run make.go
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/* $out/bin
+  # devcam is only useful when developing perkeep, we should not install it as
+  # part of this derivation.
+  postInstall = ''
+    rm -f $out/bin/devcam
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
     homepage = https://perkeep.org;
     license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan kalbasit ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 3ac719d18d2..347b77c7ab4 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -8,6 +8,7 @@
 , iwSupport     ? true,  wirelesstools ? null
 , githubSupport ? false, curl          ? null
 , mpdSupport    ? false, mpd_clientlib ? null
+, pulseSupport  ? false, libpulseaudio ? null
 , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
 }:
 
@@ -15,17 +16,18 @@ assert alsaSupport   -> alsaLib       != null;
 assert githubSupport -> curl          != null;
 assert iwSupport     -> wirelesstools != null;
 assert mpdSupport    -> mpd_clientlib != null;
+assert pulseSupport  -> libpulseaudio != null;
 
 assert i3Support     -> ! i3GapsSupport && jsoncpp != null && i3      != null;
 assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
 
 stdenv.mkDerivation rec {
     name = "polybar-${version}";
-    version = "3.1.0";
+    version = "3.2.0";
     src = fetchgit {
       url = "https://github.com/jaagr/polybar";
-      rev = "bf16a4d415ea7d8845f578544de0c71e56ad314e";
-      sha256 = "1jcvqxl0477j0snvh1rzqsm1dkfsybix2lgrlsgiczdxfknwz8iy";
+      rev = version;
+      sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8";
     };
 
     meta = with stdenv.lib; {
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
       (if githubSupport then curl          else null)
       (if iwSupport     then wirelesstools else null)
       (if mpdSupport    then mpd_clientlib else null)
+      (if pulseSupport  then libpulseaudio else null)
 
       (if i3Support || i3GapsSupport then jsoncpp else null)
       (if i3Support then i3 else null)
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index e5cfa145bc2..efaf986a9e5 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -3,8 +3,7 @@
 
 with stdenv.lib;
 
-let patches' = if patches == null then [] else patches;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "st-0.8.1";
 
   src = fetchurl {
@@ -12,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
   };
 
-  patches = patches';
+  inherit patches;
 
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index b53a79cca24..8f8494ac45b 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -65,6 +65,6 @@ mkDerivation rec {
     homepage = https://yakuake.kde.org;
     description = "Quad-style terminal emulator for KDE";
     maintainers = with lib.maintainers; [ fridh ];
-    licenses = lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c2471d8a0ea..ff9b8b10b18 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -138,10 +138,6 @@ let
       # for updated patches and hints about build flags
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
       ./patches/fix-freetype.patch
-    ]  ++ optionals (versionRange "66" "68") [
-      ./patches/nix_plugin_paths_52.patch
-      (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
-    ]  ++ optionals (versionAtLeast version "68") [
       ./patches/nix_plugin_paths_68.patch
     ]  ++ optionals (versionRange "68" "69") [
       ./patches/remove-webp-include-68.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch
deleted file mode 100644
index fc1b609479b..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index f4e119d..d9775bd 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath>
-     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
- 
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX)
--  // If called from Chrome, get internal plugins from a subdirectory of the
--  // framework.
--  if (base::mac::AmIBundled()) {
--    *result = chrome::GetFrameworkBundlePath();
--    DCHECK(!result->empty());
--    *result = result->Append("Internet Plug-Ins");
--    return true;
--  }
--  // In tests, just look in the module directory (below).
--#endif
--
--  // The rest of the world expects plugins in the module directory.
--  return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+                                 const std::string& ident) {
-+  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+  const char* value = getenv(full_env.c_str());
-+  if (value == NULL)
-+      return PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
- }
- 
- // Gets the path for bundled implementations of components. Note that these
-@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       create_dir = true;
-       break;
-     case chrome::DIR_INTERNAL_PLUGINS:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "ALL"))
-         return false;
-       break;
-     case chrome::DIR_COMPONENTS:
-@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         return false;
-       break;
-     case chrome::DIR_PEPPER_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
-         return false;
-       cur = cur.Append(kPepperFlashBaseDirectory);
-       break;
-@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
-@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         cur = cur.DirName();
-       }
- #else
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
-         return false;
- #endif
-       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 16873ead34f..7f2f4387da5 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4";
-    sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp";
-    version = "68.0.3440.59";
+    sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57";
+    sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv";
+    version = "68.0.3440.68";
   };
   dev = {
-    sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg";
-    sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8";
-    version = "69.0.3486.0";
+    sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv";
+    sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx";
+    version = "69.0.3497.12";
   };
   stable = {
-    sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5";
-    sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3";
-    version = "67.0.3396.99";
+    sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw";
+    sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij";
+    version = "68.0.3440.75";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 838cdc31519..f217d853f0b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b8";
+  version = "62.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "976419f6a9e05ce99eea023bb4b3b14f8777aaebb4c18e8ec798d59f0abf9ce0e9470c552cc0aa1f90e53afaa5691b5b8ecac446eac39ec95b7146cfa0f76f7d";
+      sha512 = "141e5f280b13c1440012f6b796cc361e3b5a29bd3301a18ee13ca4b860e21b8c5ff8e6640cd2c57c577d4f4ba3922bd89d96dcd9dcde8f7090238d663604461c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "d6af9ccab5ba0e1de78ca080cdc636928394319da8f0c04d5cbb23e248494264fcf8f0024e02d3c739771e2556c24db791ca93da0c9b7c629244fb43ae43cf43";
+      sha512 = "dec1fc688e936e24e390436d881eb2adebede9eede6ec5b15c7732413d7eaf545d5f93e5515f4e216aea8ee26d5ada2f02ab8f45fe045669659089839a3d2de4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "a384bfb40654d2e2c2600b45dfb11abb0d6c1d09e99a988a7f8f515b4b40691315b3960116f05292321a40977f8774403ba9c53c299caabac17f911e7de41914";
+      sha512 = "3c25a7ca65184198ae3618047fc9f7592164367926492da6839e50ef2f72866bade1f44e9991fa817503b1a6b02a5d7400339ba330018e21f6fe863f6b7f389b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "3613cf6b7223bac23e46dbe6be92e64c6018957c739d192d485b97d8c1f77062aa385015add4b4e28bc7a3786391fd5711d5f432f86d90264516c57be841f7c8";
+      sha512 = "7d7edb00be607d01ed2e4dd50027b2839e4abeb26a89b4d85a2581545c8cd43002ec116e2073ffeaaf98b6c76fe185ed836e49aff2a2bab6f2e486dad55bf5da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "df38f019e4968e48ce56228f2d3d10a347da252ba3f09bc04c587af55fe669ea6cecf0d5f8b85e911abee074bde7f3ff5fd68780f958619c417af279ac53cc00";
+      sha512 = "0a8d24f7c1b67b97d511f545a108dcacad9a1c1ec5004a1f1f6571551c52c14e9f98b341a61d4a13e6e26490a3c74fcb1608ab9dbb260d5f1e4d421fc71bfab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "d7e29f7c6ef5ae6761a306db95e237cb35c7a4dadb76d648f7b6b655df13ddbb5eb57aa9377dbdb60696784c5c27b06c8f5b3f0032f2fe0e3f3d89732ba61e90";
+      sha512 = "5123dcd2f0d4dafbedf3efdac669ed9f3837e092d53f23a6b4802b83e8f61b401f03e41911645125138bd09da1c3f575c053b86cc27bad78ad49dedebaa79ce6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "8da765b4bda4746682206a4d759de0233a16b2e940023a42aff9d23e6e0590803d737c0a38fb5f69f60a217a66776200211ebfc1276d4417691788e4d4b31257";
+      sha512 = "aef97cda7e502651e88fa2099d39420da38ba06093516946223940fb18ea0fe52e0e5c83d1a7234003d70280320c40a83bd7e4a3329dd5c92e7b97144d884595";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "772bcae7cc6a329bf1e5f5fbd9634f96fb74dd45326e4e3af8a4819d08711cd3d5a74af6b319cc8876461d8c6c2658917b12e5ecbbebc12ab3fcc0bdcb5cf90c";
+      sha512 = "d6e04dce19047627906d38362012de87f6f64f919de2f1d23e60d4c686d1a7434290710def14a2cf3e932876949f64e74be3de1ab5318ef1a6118d32b916850a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f7764fba619b64e86a35e0b420c1bb8b2f2db1a3cfb33811e68faee7fda579a5d6d136b989e43fff802ebbc3d8c3977ca97e3e09986abbcd956920bfc595ef89";
+      sha512 = "8f2fcd0777da4d0bebee0151fcef871db78512cfebfb1ee3bcabf069e14134ff56734fa784fee12160f8a2ad3d12bb4f524b831169a916713b5ba5ea1324ce3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a5e74480d539b07dbb08ac008135c78d844e55c9554ac8628eb4604be7e5d3c1c0096d4058591fadca9d3c453a5c57f63767fef601d76f815e9094742d092d7a";
+      sha512 = "63e81570ab71eaf477a661f7f6484de53ac7200395ce2ccaac7b73d6f28f73abda7f4c100b6c65da39e075c0d63f7e3a3636832d0469a252c9aee1cc5e36ba95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "911e516fd105a7a306f9f9fe022cc88f235175693622f217f604a5bbfc4a031a676dc15f56178d1465e531d5062818815f4e7d59653875538fa61403fa5c96db";
+      sha512 = "011c335a62dd7cdcfe1000f616bdc7b826437e09134b1773c5380d05d68b6e32f33ea0ea7d75b132a6098d676c5326ec33f35f5ae6acdf125e5cf607f803718f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "d2e6d5064691a7a1c8dbbbd87df415674bdf3565c2b70e09c986462a776d96fcb56ede5935893fb7aefa9ce79edbc8ea4c35f4ddac10a5a18c47384bb0d9e8b7";
+      sha512 = "a3f052252ab65fb284ade27c67ef55eeb7bc0f78a8a8dca539e356617fcd3144946c55c08eae2aa09a8337cf3ec2063f21e2d976248b647ae26cc159bdfc9e83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "d15cd4604cca0339b7db9721910178d9f309a8ca30dafe1af291f2c4f7fc9747882f6d1a25023e35481fb4dcb46c41f9e4a450caf8ab4b5eddef39e4dec5ac60";
+      sha512 = "30473eab751e7af94478b9a79af008a33a1a7438c85db0f46d96a5848a707cd511a82d67c91bd4bfdfb473c6bf8228ee0375ba58395c82b56b6b4fa5a714d3d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "5a95eb672c15affddd475777a70e82442df6fee9113c26d668aadedea9f30cbdf3e7d69906885f504439f17d04534713bd217d01a5c417ec0a0e425b858ccf03";
+      sha512 = "424486171233702a57601d16f1706175bbc4d32bafb7786a4d01226ff16c1da0a7f3df08343c317e9dd2da3f7aa4ef65e3545265271f7303b65e35deda0a8d20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "76e4c7dea27e93728dd001dcdc9237a9063adf3b9464237f516af93e0a05a79d15c1998ec07e16bc198418bf2658d27438df06e76c9a750cd5ec0cad41290390";
+      sha512 = "0ee06e265f188696f0f73047cc1b8b25df9e4d6940b6d907d9a8cbd241dfcdbb75013a7f9300d29b07144a92ad509d87637807f19d1235c4886d5ff4ccab5fc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "cd9353d268a04cb860a40febadf20bdfb20282cf141fec1e4da8fedc344e9bf7afd2476d5af41c413f732a5648c80d961a55749166d135925890310ddbfa2989";
+      sha512 = "50678ddbcd6064dd2295496aac5ff3e8e563531163fea9dad4c25601c755680ddb50c06f5ca038167c0f8af0d6f003cd578eea90314d8f7628b5057f7a9631d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "edc5016503aadf1edbc1c9dd630d68a6053f90f11bf8854d270b2748c63d4104e69b824dc4c4f39378b533ea91e7ef235dc3b9bfb57573fe481e60743178e5c3";
+      sha512 = "6a3b71137b1a11824fbcf5e1585c12edf8f43fa25b725bdd0658336c9f89c7c8b73b0598165b22b28be77296d889fc006c4bc13a505fa9716296775a95cfc1fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ad642cf2dfc2f4167549a8800ab34acf4e328eded52f56a456d1fd9dc868f37a583ca04175863e11ed302d82aecd1187654d8fc70808d5b6a1080db0f35b4b0a";
+      sha512 = "b86d5c201bef12e50cad61046f15c06c0641e686134ab1d698147538a766bb01081f1430afe509a7fbdecc70daab983175151968639078df6af1cdae2f92a01e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "c15586f6bdcd7b2148254e3f7adbbc034efb6f981df0f320bab265fb198e87ad37f1ce530d08f8e6996ce8777e2f42f94904ead72cc4041f11210b8172261127";
+      sha512 = "2d3abad249aa1e20f45a448f66a515debefcd410be48a952be46c8a75b8ec7afff528a9353fb3ed11497891d2646df3edc5be8bb231bd2e41c24da4598ccf377";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b5815b2e683532de669eb4889d965447fce265bf50139f28637d1a7b2871b071fd6b01118c9c3214b50cdc7d2c761fb6c4b8c2d5be0b3cd53c89fbbc4ba4d426";
+      sha512 = "1648fceab23c77fa0fc39b95e0cc52f501a82ea1bc5f3feaa431ae8ea934db155bbde0dba32802c2233422c230befb1062a959a37b73343cff73712faa047c7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e942fa992b0590b617ce69b603807780561277a2f36ac1817ee85ffc1382675b69f2cbf4ada3fe9c796698fa8f25487752d5f290b195941461149526e76026f5";
+      sha512 = "e6158fa1919f6929a3ca870ffa85c372f78e9d0f949d61852d7c12a5876c257b853dfb709983297a139d61a47a6de8ccbcdd770898a5db924b83ceb102295fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "1afdb58288c58a1cf9849f1066b2644b2e1fb1b20322a2b97fac89bd90a3fe7e8f8a159407b3f8a7009307fea1e32ab2ac2638ab522e210e12a67a5a970bd14b";
+      sha512 = "2212ea13768d65fbc05341e0e1763874aad3731b35f342289e82bb9de1f539044049a0c66b5b94be6daec35993671ee8c1e06e4097c0f22ae9e6561b0baeba29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "c61a221a852ef309ccb04a03a60141d322bd895c5cd82a3b5a3c03e8cc5b2846111e9a0dc8f390be8663a9c992d46d1608f32bc6f2478519ebb0310531b96467";
+      sha512 = "09405b6e4cefae4cd61a9cdc05f5b69584771c4eeb5a211ae278ad7b9eaf67ff493c62065e5ef4544abc3ed509c53c665163bc5fbb3cc95eecf09df1f6a222e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f659791fa08b9f93e3d33fb7ae783a51ce6c6d3cb99a1ce044d3b81408166e69c596125b7e977ea12a49feaeacec6c4b2cc49a196016bb61b3c7eb8699b0b64a";
+      sha512 = "69208896166416d4e9dcb528053d7bcad796912d564c3b6a265dee4425eaea910a14fde18dcac8dc615f5f4477c1c62bc500bd50caafe53022238097bbf2312f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ac051d88ce3d514533017e48d87d84310c110137afd53360988557e7660eed4953f77d2b3e4fab8685f53644f84a075004f90c117b01f23dda6f790a5fb4845b";
+      sha512 = "00c6f274b35b38e68bd8745437e73458851145fd5a5797e8e90d11a9f8d373e0832e337ec4e77cd76ec5713a97b3d7e8a400d65c91f60b704881ce410d4305ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "38dbafef566b20ea488a172319bdca879043d50bac583ad5351a74202ba4caf24f0f804b8d53ee974323c0a9c05814145b8e497a92121599d1432b8203559ec8";
+      sha512 = "0d5ad1a42c1a95bb7c7025bd41ef1c8edcbb30f8ac97894e6881db4249fcaff4c1fb4b669d5c201e871af15087fe1155bb769af5c99851127f240d694e8f8f6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f0b76ead6b1bc72832cfe0b33edfc944f3bcde24d7d2c8461fb2f7e5a5964c3eec9506481302c9fccd00d61b25ebad29675dc1e5c8fb6a627ed665da1ceb9fd3";
+      sha512 = "290d020b458546f2c70098555d0a76eb49acf8c8f57e2ee64d3eb640a503af2488cfd7d6a99d033993d742c030c15385d6cd111267bb4cd8d40d277e6f34fd43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "83079739bec75c386c14086e5d20248520f1805df20293ff7b9a1c984994338c370472bd1c21163006a1b49ef40b6ebe396cd9c5f1fc70c9beabd5e350f87ca9";
+      sha512 = "a258208143404590fbf367f554169f441a3e626dd100e9145de0d3777f7598fe2f404a945bcbeede4743535763d19c619a221b3774004327e315a61e565f7a28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ab7ef032be8e75b2b329a4ad25904eb25af6499ddd971d4aed758cf1d32599cfac2f6fbd4f6e311b0bf8b501a6c3edc28a9f6bffe96d784a7fcde5dbbf58e9aa";
+      sha512 = "daa7a7f23935aba9b156dea9597d65386b95146a47872ad74213c188360eddb03b630b143866b37e6ffae7f271dc72a27f0d84c71c6cf73c48aaa686696416f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "7a40b322693338b4efedc8518d2bbc88d8ec131fc390690655eca3472160577c3d43bc13dc289afd8d7b8a4eab834a2ef7241e88afa92215060f747972b4c3db";
+      sha512 = "208d9d9a53ffb8daf32a35e3500765a2c700847afa70dd355fff2c6242165ddd35b0044bc8512bd5fc4ddf8a8422a109833f8bcc15f0b6349464984126094749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8a38e2a7d97a1b789fe8e775b3ede56d65d2110752599ce38c25b688dd91a5286ac4b8fb29f89e478e9386e8f7a76fe3269f2315d2d24b1bd723d0fd0ab3dedd";
+      sha512 = "6e68b76b140b2823d5bbca1c6705b2f71b01cc66c6296e28674e85f8294d6a663e27d2e2f92a150be5f79457e7b542963fce45b0146323f736c221eebf199dd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "040b07e88803a935e6c4d5ecc568c6911626ab8eb180706aec87982474e638cbca6e16e0dc10b95cdc2da11b3ca385aadf906bfc05525b86993157e617d79c71";
+      sha512 = "f916ae9cb531aa5bd217ede28bf09495c989f8e833d66562fa2cfb9e26edc600fbbefefd59aed117dbc0e292ebab5bcf62b39aee6daff37050353945a7602309";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "4886bf3e199238fc454d5a27292f2f245522a2e6cedeb7510ee57af19927f28ee89633cf052079e1740f86ac3172c63b34de8bf98a113f780db44dfd2c7c651b";
+      sha512 = "0e9b6e7c98a91d90b885378ca7281124f9b53b2e139d6238d75da1e118358703dcf882261cf2c85350c372f5439e629dfd75fb1759138fd69fe63ddc0b09e4eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "081cbb13005cd2885cd37d8a8134f6852df4f5da78bf14f2752814d707ac7cb7f9cf717a893cb3b6035b1236eff38656d95645055327c7cf20e0ecfa45d52219";
+      sha512 = "02c6cd4956391a935d663393ea1af8f97721e5417d0747b3b0ede403e7376503a4628bf600ad7849b289fb6e6940e5f0ab048862b1f20d4d8f7a593d6abf9d18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "223e0559b85a0f1e49d34f9d4a3308854d21f9960c294758edc2412b9022a6f055a8e592578a2125345b51564976350b2c0c8a3271b7f8c75311827f27424908";
+      sha512 = "a0baa3de6c78bf8acb655c0b30585abdf4a886945b7e97389e80eb3372fdeee4e01c0c376508bafbe7727bc6df8058472616afa395f79535b67763d8f2559ad2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "460edac7f75697ca04966cae37177511d50d8bc68200735f19f789b81319fd35ae2ad4243c642c6d135d90994e838709c3c893440569f0438af10bb00e2dbdd3";
+      sha512 = "0c9e076c1e7c563cdca8aa80cd097cd2b232276fb14ed56b28ae56ebb26f8d5ca1c720784b44dad860f0b86f17fc2c53888d59b0aa6495c2d8cbd82703c0db9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "caec2f49d1d399feaccfae6dfe6ee665959a63b8a858eccca7ea1067d81bc70f9355dbaaba3ec218e7b743bf3dda4f1a139feebd5f6e50e3e7ffce9deb1a2791";
+      sha512 = "3c262e88505932ef95d45530d822e1331ba63a8a7f54f04bf17f3a53bf28bb91ee42ff76318a582f58227b61ca1ca9c1780da9a257c5a51a0494ba59467a33b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "23585d379311b0226f999953ae7ed4446b2b4a270695e64bf2e4a7ce4b5ffbb7d08f9a349f3d64ce0305f7be01cae4e86a16d148b02dc0cf1fbd57c7c131208a";
+      sha512 = "9baeabfd553b98b4c53ba02a58524b2c1ec07cce92b9e51edabc2583d3ad8bc525376b2604330bcb6764bc62830dacf641e3de82916a6df0003ee0b52072f46c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ea5495010b53da693b4d1a62a85db5faa30fffb791e92554e88129706e8b47560e18df8ee8b45036e7c41b3fc2c5e01ae3641a4ce3d3923882845d6e154469af";
+      sha512 = "16b07a0f348b58448c9646d0de7f8d686838dc74caf87184dfe395fc1ce5b1a887c57caa3da2e3bae21a52d283f3929362b826925b62ca757ca4acb80ddd9ad6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "19458201c72009c8ace9b5d0d2de5f0c3d091ba36dc4394b47fefe053958a55adc2db6301b822fe0ed36ab2eb59bd5acd6816891578ac1870f32555347f806fa";
+      sha512 = "230b7144c19a1536efd264952797be74e6f615aa5a25a648e03dd8f47dcd50f1bc9b22708d7ed3a4cc10d3364cd043c57860b9c1a152b83d67439fb238b81e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "d88e0685f0db8d05ba9ff6ac2b35196d869ed2ca54eff95c8aee35169f223c97a1956919bf2efdf15d3faa3a6d48819b6d0a42cda2aedcf357bfffef71dee053";
+      sha512 = "b917ea11cf2bbe49367259eec378a4674eab86c926b89d090137056dd459d8d2c7670a9733eb4b0d4e0fd6166ba58854c4eba190a1d99a5376b390a945195cd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "a510d5ec4dcc1c4524e42698ad5b231dbef5bb70538a4694d1fded06dd108218ed3a2a154fe245682ff8c71c306fdad7f0e6a91e4c177c7b16dce82eef57f6ba";
+      sha512 = "339c69eee74cc48d3aa0c04625cad84ef564c56f4471230a737d126fb77e15a08e7b98dde625cea4225b7e95f75b2fb1aa7ba4f8a005ed3518a2949638c739b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f1cf8a66a9a3d91b225a54ed8082ba5a73e0a1342537c25e43a1233c333acb8660d037522bfad024c86e387f3fd411456b4d3148591ebd33303d8534837b6a3b";
+      sha512 = "f04d05f5808f194a8a2d675e88d255aed01f6e6b91f90e6459b896cfc6a9c9af3cbc669274a07bb8ece0d401786090f05e0a762812ceb0005a4f28345d4bd32e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f1275ba2ae78178bb04ea794d29839aabbda623f8af69b5a6a10b3aa820b4f986d7c0fe5ef4f436057ab9e418fc8f4ba2f076e09a5b92064f835142664736ab5";
+      sha512 = "d8204c6e70710e5ec4944d59609314ee8bf8e0a54ac637aa63ffe15e5b5fad215f6af8f3fdc7ef3765e72a70559dc8c5b5b7cd7d31c0445c64e5c9b401fa29f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "b42b7b165007d76ac30296162588dce0d54742243e9447ffd8d1916da6144e0cd4ae386db8e1c5adb0685fbd550d96a7d44cc6562811621898523f01d2651c19";
+      sha512 = "0628e53b0b88bb8cd959391c1d071772b0bd07f7585466fa8a8b0a5f6be63b880a904c9c8a8f059a0a287546594a532365756fc5d6ddf302aba8c70e3d9f26cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "98f350628372e0ea3e6e55b55d583dde4d1c54483b53d15c3ec01ce2e42fc12a35cb3248c11019d10589938cfcb64e1b4fb4a9cf84b6b660ed0e06e1671cafed";
+      sha512 = "853e05c9ef13ee2d8c8739cd0d5173ea45747d9e85820343f292fdedd7ec3aa0894cf33d3d3787109fe30fc3bbb25d5ec0149a5905c7ae9ef81a35ecc69b5a8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a7c567bf0243e3bea872cf5cbd492432578a5c293b416cf9683be59b5fde31edf668f661d0a98bfac56764f7eb8cdfc63d7571e4451bb5d3ba9a06caa3e66fd7";
+      sha512 = "cf3d52618cf17aef06158d7843253b3933a727ef40ee2cf0d68635247aea8bac30b0d3a13b962382155857026bc1ee41bf08edfc5d359241d9292bfb60917142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "16ba64cc577f0b5592a76ac930c818838c505c0d2042a954ab50e3deb64dd38ab4b4be46683dbcd5e5de863b6da0ce296e5539b4baf73126a57aa390ec0a3c2b";
+      sha512 = "9d17bec7877c2f9d9d3760549398d98547ff8b9401ad562a38d904b87bf9fa19c42099f15c12376e87ef0c6d0e11bf4549fcd1d404e45c898278aa5a115ef691";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "f4c028e35a81bbf806c02ddeca3d97ad7673c0fd5e6b410dc14d53defc485f3825130c0e1f609e5623b5af7a670e61b3a5038c6373b6f862b729e3c6a1ad9acc";
+      sha512 = "5fe3b888a35a2efc32ebd706254537cbed9e6d97856f1010728aa1ca4bedcbcfe05ad4c6bd6a69d7bad4a88013f0aa5c722be3cc32f0d623f9e6275368d80e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "7fb001cecd52399a65ca87ffbea3ec8411f223756c72e8451f20c43bcfa11f66cfd59412a284edac232c12c952516d27cf7d620dc5026101ae2abc798504e561";
+      sha512 = "a24db960cf6146b98af16953103c88296affb340368cf11f2c16f2d9c3ab65a93d7b288e1d643070e6b68ccf80be7386748b9ff5696f5e4ecefd3f66b9f538a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "dd71ded6761be477276b9ef79965e141f688c0311690b41f7e4f777d8fbd8b47510e2142b26c9e70710bd479e8fb840c295df5083ae8ddec955c8d9e40b2977a";
+      sha512 = "9c89abaf1db0aacf4199638cf5b5a4c07b955b5350e4f084496f9cecbd5d0060b4e2d1d4dbcfea7bcdc02d1ad356bb4aa49ad167861911f7611e72fc51c520d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d93690c9abc4808b2ede8afa2ef6b6f537ab368261ed81fc9e45f0632ff3d53974faf7f2a5202ca2d2da14a1b7b610f865e18cebee9cc609a36a3789e4cb70e9";
+      sha512 = "5e04b44e4c479bd9cce19de826c92a0824ed48517dc18c5061bfc9e04192705de281adaab0207261835be423eec28659fa87a0fb1b5da2eec379d5b75215d0e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "5b3ff686d066d93c1db1a727bccece4033f69d5c1c322e0fffb94b9df182977a40addbad1bd75cf5865117caf1f4b77e1ad3c5ff7b5880811dc2842052e00dfe";
+      sha512 = "150f257a0ce943546589cf97c9acc3536e3eb34d7cbdd47924e3d3889cd7ad88ce6ca175851eb3d9201ef3aff7795f8027ee31dcb163f06e186bd36ea9d6ce6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9700df084080f237ad4fba49efc9309083edb735d924842243ebe6958d048596f9d09724e69f33ba2706af9ade3fec699d8862c19fa74c8021d2ab36e55c1559";
+      sha512 = "9b7ed329a473077fdae2faef685b0e45123cff6629a1f205645150eb6a1fd00d2559b82835b04f061340489ea46ad2e8056da49870db3e561efd4efff002499c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "bd1f0a14933ccb350bded8d268b4077fa627ea5fb9421d911a9088e5e69a66802d4904203258b7ea1f738bdc6836c8b6bbcffdc3896278aaab5011facbcdefa4";
+      sha512 = "df5f981d1d689e62bdf1eedfefe5b83750fb289e4fcfcff83b7656a4ff422a03125021efa713385a03547e27caa16e07af731ce118d7145a7a622a29dbef4158";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "469891b6d7236ba10890dcf63e5b1a5e67a70c7974a176d059568aac47b2bbafcd7592f84ff525e644bfcfeca78474ac0677d35e0126ec3d065ebd4f2d279e48";
+      sha512 = "3ca6c1b04223dc2faa6e978897f398cdb87c9621c1f9a35b7d160d6071c1fa776434feceafc743d6efd280c966d5ac462f6d51284c81a15acf4111dd6c49b326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4ca404c9a92b0c9de1a8314c4ef0b6072021761efc42055ef7c6ff3696fa23edeb04a0aaf982e9908c81c4ca54508e37052dff3a4599ed9b8955163a43a8eb82";
+      sha512 = "e23f125394069cb6a02f9c24324bbbfba9bca8e04a29840704c9fd100745a84151db0b09d6792560a29680d6c5543fd446affbe34ba1cd73f06225a1a799cf5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "2869abf3173e3fc1e2b4cd7effb65953ba08ffc0c8a485e1892a71e351902f303617520d4434d9181606c1dd3a86321eed2039a21d610923a3817f0541d78eb0";
+      sha512 = "15550f601fdda8166140ab74955ef870e597b7e6fec72571c1e3b190f7a19856fce6bf90c9f233d9a90bef709d3eb54632e788a86f3b14186353bbfefe183ca5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "0edf7c720ae7ea1f932ee91f5f3f24a0c71b640d3e85bd1a896423623a64501dc6066a155c430b88acd02edca882aa660f213fbef7b2040a02b91316e4b099d2";
+      sha512 = "3ce50f80908e80decdb6e71bb89b7d9a4ce3dfedbe5785efd4f7870d1b2c46da7c660ecee2b6532741222da3502043b8a23e96ca31fc9f9a3098182173571325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "0a6aa980cdd8eb371f9909b57f9d1b4958983ae9ba471e7396054f3e22665565ed4f24a0920411cba48237ca283069a4de6b706cdac20d9fb53208d145932a33";
+      sha512 = "55405f1cccbb3bf8b9f554a45a7d9270e1e7766ad82b202cbf733b95ae88fd77452a3bac476122dd4c149fc76c5e59d9a14a53fab7b9669adc10f1fead679388";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "57b9fd1bf501ce887a31de05d82e39245b803d017f0a2707bcbe467e4885b7b95dba60ce3c38233f718b84190d8c77598c1f9f5bcea548e4741d55cbda056435";
+      sha512 = "d7ea10bca7bfc0d4de8e4c21d8e1c409b03921cf553bfb5ec6bdc51f9a8864d271f58d96af33bb657663e9aaf6f00882ffc225da555eab52605f625b18db01e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d98284b722936b8f60cce73632bb79c6cdd8d04e29f4bdbc1ef8020c477158c3da9e8b02fa48e3bda5104671082349e9c436d2860425c7ddfe36393590eb13d0";
+      sha512 = "9e54689a8302723ad301687dcca888317892f0f03a9e2b6640e9ded1cbef4618d263119a956836ed387c926e3bde6463266f47f9c656df86941728b12c0ae546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "ed95750250e19614a62f6c1c2ce66e87981d964218ae2fbcf429081e2dd4a88a59b28bbea36b21305bcb9d53f7e8c7542ce26c669abf0567664eeb85264c0139";
+      sha512 = "8411e135b81863bd49d76e68565ccb1240ff383b0fe0bed835af204c95374f6c5bbe14716f1e5dbdb9dc5bd3e2d5e003c98005f2e7c93cd85c38b85dc4b93895";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b6e3f4d266c9c9c8c9da1f515c8e80b4d35a7d0e39a0891398656f9f714a67c974c2f6f120c76c2cd322902db03a4673baeb84b82f43116bf357da1ceba33729";
+      sha512 = "c426bef4210a9dcf67644e67f4e316a6547a5f02716030c8688564de2993524564178a36e964f159022ba007c95d85ab697a7f718b932b1c2d88a699cad14a77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3961315032c0ac95a2d0c995be494c24aedff7dbfc65b33f92d19e2123f77f7851e36970d0e023e299d64e1ecd20c1e68da5af2fce87cdb9fdb75e322d5568ab";
+      sha512 = "47b2afd069a86270a7a227286997d75a50ab83e56e36e310252dd8a7b20b3a6cb34aeea379550d695c01b627e5265579a4b75f267cafba20badb1332fbc258fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "a09405c21427153710ad3ae2e83b04381c101dce14c3b99d7ef17a8bdb4fe7dcb7f7f59d916a9520ba96652dacfe9bfbd374b3c569e420e1a5b43c763e002491";
+      sha512 = "72d65a3ba9e39a30d15b79b241b76a9ffcc2c03ef1942067c4a5947250610ab289926e9a0e3b8ee4903164bc07e31c8d548abefdaeed696ca0c5fbac401f341f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "bb95adf7cae84a4e5c37d33fd25efae472035d816c37cb4d6e2d94b99c260045fca9ebf68d71bd9fa096caa2a0f9c13d828eafef3a1b9ba7c2cd81e9cd6e6bd0";
+      sha512 = "7bfc29f2f04395a8bbac0bb0df647769ca8fdb5d24411b66204a2fc3b03df380977b2bdc07e62cc9cee9bc15cfdc637166706505712fdcab644d08b19324b62e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "948fbb58ef850dc1c2f0c3b4a55c7077000c3697ddc63b524ad5890715a72c4d1bdbc6e48f901128a43251141aaa61a4b93bb655385185d3ceecec0114c55f91";
+      sha512 = "b7b0ac4fd8c577d3208dfd99e68f491c7292e320da4be5e69d87c35a7289ef85937743ddf94b94ea29956859caa61b2926221a523c28a6502b170f9a53756598";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "472348038fa02afc5deda78a17d5b1d43a7b572925daf76720c9a18eccdc285ed4c7a46589f71764a338b0367b3d64f5ab18a57eef54dbafc2dd10e69cb60515";
+      sha512 = "ebc6b1f6559f8f2af68116b1439d5cee695991d458234b36afd0621e9ee98d4361ef5e9dff4d8b5c3721756a16857de7bb1928e99767fcf374ebb5478e69b9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "783a40742f33d6546bb6f0fa832531faa0681fefb5c0a60c151fb5b52ca6201e94995948743442cf7fcba475bbf901330d842f4e40f948fa9afbc1f4da0efb33";
+      sha512 = "148c56f85858815f8f3206f2cea2915c46bf2cec601fe7355517474d10bf6f087504d43f80aac83171c867ac4ee7b2a83e19cfa515dacbde56a1c36ca45c7a59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "4a6c15e0467baa49f7d71812749a77b0c0d40727db1a24ed06ee25bd21f0abc904d1c2a101c1d1e2002c181e6eb17fcf42e5bdb4d592a41a10b4a49552f49061";
+      sha512 = "59e18eae1b625b74d1f6c51bd2e3d5c790521f4fe64d81448b7a2260b02b8e40c69f1a681002a1307adf0e725f30ca027e761ab055f0463465a264bccfdc5b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a0c4ca38a35688947de35578f101676c174e441f5788c2c1b0538b818daba01c7a79bbe19b953d8b503e540edc6bc3a435ca0afa75fdfd6c8dc15b6e728854de";
+      sha512 = "59bc40dd5c0c597ed2b5c65b6a911800f90faf6e1576ee3d62ff26caa6aa91673e7f8e002fe65cac1030ba4b5f3b00d22e362d06556b7124cde5a41213d4dd1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "48bb5fa2aac87aabe50534a519e2d65c5aa0fd38e9b8f2d3193df1a94d38d02faaf40e2ae21105fa30b5b2e980d44276c274d0b60dd8a06142d3652a321d2ee1";
+      sha512 = "487132fa97faa3fd152261e94c0d5d2c7ddd05051b437fdb1ad586e75fac5072369f4f6fbc3109f00cac5cc9aa99b96300fce3536d364b916f080f98da27139e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "50a7f6338277f08ae3aec1642c4db5a55118f0058f8ced336fcd934d111439083982cd72885420273f398cbcfa82f5e3190f0d8d91571cef5b3053959df021d0";
+      sha512 = "83f19eb17c6bd977b244be27ea374335be1ddabba084ca4a44a6a89bf1beb0b6bc52c196d66e39c947e8ba756ee52c1b0f157afa1dbe907b9009c4d404399c18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "aa7b1e86d620b695954d4901f2bf95316dced89f5d7f42de13d45a81cdb198b2098508978798e561c0d3d3c347d66b7784136af0cb0a10e55426cccdc162b35f";
+      sha512 = "d9a61327cbb8a7a497421a2a00174d1e8d1989dec9c10e50f4b1c17e935b82d6871949dd6fd35506c5dedd6d729c968650a3d25a160da32b9d20111b5b63893e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1f7f603c1fdbca385ac164c3cec42bb628aaf83a7d67edc0ceaf07c3d172912d43d47490e826dc37bf0e3b0cce5d80d193b4046eabb1019e233487f4bcad21b7";
+      sha512 = "848187b6f530ddf5f78de17974fedf3662e2f03dbcf7f5f47a0d0ca6507ecc6764242c5a727bb39a728e4ca54b7aaea27492fbb5a0670c2186f5ad581ee9f1a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "26d0e2419a179f9feffdf6e08c55c5b0f1b39167be40db54fae171ca438f781f5c353016747c20b39188033e2aef5c556a505f8a296f62bdf69574aa11c80b9b";
+      sha512 = "bab7b0b13a4b2e0be7ccf4fdfd35edc5829af8ab661a52549a511644da78ad220d2bc57be0d2193f3d9365476bbdc38cf55a42e774bc113fec26f6ca60dd31b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a070992b30b159ffbbabb98d9b97afa55db237d806a7619dbcd65dbcda2db202fe3be0b43a0408e0c3b34dda3343decd69d9a3cb1b24f89ff60c422826e96438";
+      sha512 = "848e886a84a3df7e1ea0a5c4e5fa9910112524d4f30034feb5587467cd4ec9dca2d89e680a95564534dbd3716c8105b772c9b463e735ccdd365cdec80649f525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0728f7379104d89fb25c3a983366deff16cdd32f5f38e4396ca58e3be2c8d987bc0de95c24c123bfb2802fa5b4308bc10702cd0917294c1a6b7c2b6acf666d5e";
+      sha512 = "dfc0c340c66c66f3b20e44f3cd58cd2c829f8c99fb08658c02c13e21092734803256e39e4dea41f26d681bec91448338fea39b1fe44e5c459626ae3f2b330cc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d3cd1b3bdc282c7061db9f17b6e0ae22ed61968dc0e59df0ed2f408dfed7b348dcb0f770f61a6e95839ba99d7d3e133d3c3cbb88dfdd40d84e3d92b5f5231a3d";
+      sha512 = "b245f08c080d108b15ecbbbc50726099987971a5514e9973835c43a84acc718e014e46eb6c384eed19193b253b69c3bf053ae6452c5c6c036162c9989ce62e40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "f06c3202aae74ce01665616ba13eabdf364872f107611829e7d774e55df00519e8a2ad1aff3cb61d5acc10640844fb036a5e4aa8ab74388b649cc03f2cfea3e7";
+      sha512 = "72f329ccffdde5e17d47d44d49342b7bb6e0d635672b61af01d4e06d7e3a6dea7a84775caf6443f48bcd706815cce4c98844cf15a9a376798a99bd1061b01560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0335f6e6cbdba13dd59cd04252de746e44a3e0200962d3d406ac5047850b0d2ef784bbcf5da6f1ed4f52b1dd82a4061329b49f368c9567301166270f7f5d61d3";
+      sha512 = "f9441776e6a09f7637c5f482c80ba95fee10812214cbabd737cf2a791434b1bdbc5effcb3d1e0a91f7f6b4accaeec097ce80652c4ca0237bcbec2632c425f8de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "81f35be8df524689bbfd076509f40cac4cc8a2fad56726698f72d1aa41492daee190863d6e23fa9f94aafb9474c04069e90f331dbc40eb518428f8873edd8bce";
+      sha512 = "06b07da3df2ab84f1ecb1364c847e883d36f2269d09d8265d80c24036ef8fe141b7456e649924505f8114b26143490cf956807800f03850a538fba1c43885add";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "15a1d6a3efb209c9413a604d8ba7df8a7084e0908ee7cda4ba41fc8e4ee516af6e12ec3e0543796fbe99fa329650e3538d3ab261faa36c645a942104c57ebef0";
+      sha512 = "d74d17ec500e8c65509b97ec30ec3e14f31accd4cd50804de0774389c84a859a8c15cddd53ecf2ea89b864951ddea43f54020f40f2bd33fc77911afa878869ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "278716fece719a9c8114ab7b328b0ed03cb698a2bd5cf437529353cd4c5f911fdd12598e093c81c2b59c25fdbf5ad1f2d36cf0ee04bb640343976337090a11fc";
+      sha512 = "c5f347218ae3f5f41e7323099a5b9aa9535df6a88e9d5b5cb1d9c1c64fd2370575c47ccd1d67d599003002e9fddea1a640e04d19d1bca05669baa83739ad1843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "bda588ac74b9f6809fbfabd260de4a4dbdbb3e6f5e9c4c08a24a5432c530822b4804fe0dcc5b813e44911b61619e9a924c2c738d72685707c271a92552be2dbf";
+      sha512 = "273f8f45ca61978de31451f53ac2759a1174cc4fefa8c5e10f1307f8a91a6939ce339b1ea56dc4b7f394789f46418a6a0dfcd174b7020c66308ae32ad4d74971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1b63cc64d6ea72677f6e574a9ef4ad90c231edcad73d1050409f6df6b1702aac2af0b9326b9577c38f58ac9dc5ce234d6ef547f5a50815772bc6753f0e1b72c1";
+      sha512 = "33c79d802d4d9537743ecfc54c477261dcfe69952b418070bc7c0e40bb8f253127a6bc8a1b001c99d406f18261ac4f65454d373962203352e6828764b5017b5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "1b600fdf772e0cbff440778321b8c380939ecda502f1c5653c97c772794815236cd2a0906de4c34bc26f6154ac9dcfd8c4a90e3166121be6e288e73c26b0f1e0";
+      sha512 = "7cb1ace78d0f8a4dbc6425fa3cbcf141e63b595dede03f81eb2f4408c7aaba20ebf869790918ea7849c8edb415ddcc6d12a02c41e6f31c40d4bc37867c982c00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e606f4dbe7fe659e9011676fe1245aa8d6b1b6f814f22c1c2b71c9e6ededd4492516535e8ecb31787b4c8708cadb2d4e5d2cf09d78b4c576a01baba74b62313a";
+      sha512 = "4011c45ff581eec5c4db22a487f1de1b027b7d40dd133cffef892e3f1dfc817d1b9d06c46c1ada6a3f0b9a45bfa628621eff562d05265bb6adf4a3a8cc4627f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "78fefa776126ca7cb60f11dbffad735569bd6b76debe68208ec1386ecdeee7d49dc58482ff73c06835834270adbb8316b725ca16b3f2da8d1c790b3649b1e51f";
+      sha512 = "a060d98fb193fff7f44eb5f21077baecaf0f0658d49474cac2a8e57809403cf7b288e8b590af5f23b160e2097fc8b09a92fe9aba0edf5b5482e6056577c8a1f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "e2ac47ba49e9567755351c47d945ea7b2c0da3c06cda05ab3c8c5e8932fd1e2a36b6251ce0e9acc31b3555bff8ea5143e3e8811e0ee5fe03a926b7d121384afb";
+      sha512 = "c059806bc61111639ff803f342e9e3863561c8e89a9a075e107f5672d46bfe73f98355c0c5c4376550addbd89e9958375413e4e8cd4dd244845f08f936121de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "9d8f9fe40bf3e30caa3b4383954de68d279769faa57e54f0db2f40b102410a5ca3b4edc07caa3ef1b07cd0a3146d74133a87e89cddb6608c0e394ebc840a29dd";
+      sha512 = "1630209404ac8eddfcc831eb485f63454ca6336a87268d7cef8923e54d2922be004e7ebfd1251a42b98be170d1831edf5360d7918629668b3eacd955ede8c8de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "707c17313359e6a50263e73d3f66a551010333c3c1b7e01ffdb42eca47bbd8f9252f167f0298dc6c2d82abf8ff9cc0898aa87c644ee157869a5aaea29708a185";
+      sha512 = "cce5824503a866959ea24160179b24eb56511eee9a2905c08f1fb48379cdbc450554d4f432d37e649248cf75bb411d8e37de0dbaffeb172b417195b037584253";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "258f10e7034221e7160a3d57e63572a178c6f01ad1d8cc5f7a1c6a7166f779fe423d13095d12f2aab87e99021d16f2fd961a58acd1d0398b6f9e61ff5b9bc168";
+      sha512 = "ed0f789dca473901e00aba562c633eb1bd53d83e91a17a4943079832b22e77825ce50fe4c347ea1534c3a017837ea3f4c4d4bcb028af11db3149a886db435104";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "39043e62b42d559a5bc799cdeba2b7b7e7b5aadfd523d076c3b208218b4a385c831fb27edb6aa6d13f6a95e9de9cad82abe59a95e14987e8b68de367c364c91a";
+      sha512 = "4ac79e3f3f5fe2a5bc86577847e7e227baec60d69e34eb0b42c4cc0561b9d3cb020ac64c865fb282fd3b308a0713e8d63342c19fb46c4b477709850062b7cebe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "06767d09bcfad7380b948789f0fcb282e13a35c86b3e8ac81228042dee7b63b5e61e5bf5e048294ac0b9daa7e2a55f09c5900701ef98bcae2c7cd32cc1c6dbda";
+      sha512 = "af9b5197c345481597b7af1c7600ea07d2604d0dac93b2cd87db1e70fbf5833ce579cf8e89e13f28ebfc3106f993964e2a8314934121038de5444736c68cd08d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "85713120830065c4e9a58dcb63acccc5fa8259456a3ec43b280eaf5060104594d0fb7dce063fdc77be572aadcbe136d85614661a6cb2a1c0f32c6e9df1cd0850";
+      sha512 = "38218acbf09ca1aa67d0bd9897e1dcaa27e13ce6eaa0b40bf94df25e17e7259bbadf6fa58a86977f6e05d7dd344ee38be4d14ca2a10653188c9de8e3b950f472";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "61bef062b4ae86514ec68736ccbce16527c73fdc24cd05544edb4fd47e32e360a565a3e23bc2a7b1b4ac18718810dc9be28fa1576329aa5e0f084af9ad1062a1";
+      sha512 = "a69df7a6883535f84e67240b07530f4fde5f40a3ff526914f0e13d02ddc31297708aaf3f75f4283570fa31136fa8bfb179ec2b5110c2588c7f662ebae27845f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ffd9d1c5586ee6c228c655a47a5dda8d8c8ece0a30471044083bc59ef6b407fe8d29b9d1ae90cce856924eafe40785df2b9808418deadf06b4d0ade5a2bb2793";
+      sha512 = "63440f9ead6d1dea97761a8ee3820da2b9bb99a91ea862124a81a7f5a9115f865b449729d748aa3f078ca85057382602216c3935ff63d93013d383699c8e820f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "11fc8aff860e2d9f6c9f733fc815d8b531a874aee9c755b5ccea842b1a5e43c7038d060542503b924f7b7da2ee115f766914401a953a97490bdcce9e95b03e3b";
+      sha512 = "bfe0baeabd282fd3cd6a1b4dc69c888c58ac0c4f2caf7842af844b9e13c2b5467ff0748c836b00d6eee338a74891e1bdab7909e6142d0598417889104bee0b78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "c30736a5929601a4925a457f5e112b26c9f15db5a55182f3ab402ab64ffac18dd2a6b97f13a43504f3c97b05c6ae71ec515f70b67b8ca7d1b3eb404bb5f12574";
+      sha512 = "ac652cbbfc3a6b7173af0bb3abc142024c3d62f12cb2877d24897231b3576fb4a27ee25f78b4ede5a960c2b870a801990910650bbd725c5fce68ac6239e575ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "299e30b41252737f807cfbdc00d6c92022be5c956fe7d1b2bff7c02a627b3b9f4465fcc2bdfab7703f21af2a824366878903d8eba2de3511ef739ff75c31c48b";
+      sha512 = "b45b34e7ff3bf73258c2b26bc613d9748d179df9366ca0f74702ff7fc5d5e7eff6df4f00ac0d7e0e37f68fa15cd6c4b61dadc16e86f7d563ef890ef502193d8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7145a29912cab6a8f75de7a11a5a1dc456b1f83b061bd499894c75e656a858d49c4bfa7c32256ebe895f8f294bdc3ea227b7a6fbe33d594034a4d42834aeaa7f";
+      sha512 = "8c0a69b3d5edb1a5829c6a3968497efda942f9e5c0fb314af85f192b32f671eca6283c590daff428029fef5de8be0febb262036bbad0df64df5f07a268e7beb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "ab55e7fc54dd024561d7d6fd4bb3a514ec95b5dc2475999406c809923a2447ae0dbcbd77fc07757a79b81e84417cfa53fb6d3073abe5e9752889c6abdebd4f41";
+      sha512 = "d2cb19ac615c36a74177fd565afbe2c451727b66ef09c5c9fe9ac4a45b249b009e33c0684bf0c497b2474899b59899c11bea275b0f03d57d12b14d0dc685c10d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "73751e61014762150208f5d6d1cab78b6728dccadfa86e08f5a6fb135e55400fc8d0cdbae7213b00ed4875f808e6d1dfec3b271fd7110c7bcd6907d35b40b69c";
+      sha512 = "90b0c69503bcc24cf082a8c6aece55dfc4ef0567c4f4fdda084376f5216d2165b441a6160208c307383211ae191a5d4b1dab4129d5176338a0101790976d9b35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "15cdf76c30c2009fed8c821c127a02a48479b5104744ccc10d684aba31fb540fa8ea034c03eb1c78aa0f4ad7c64d82682d3e113fe8ad1a98be8c78890d8a9553";
+      sha512 = "4cb4bdd55cdb65a3b989a01cceee343f7962889802801d6a5c42b8125b1db5e5127da33d73b9013d97a5dba4cf495528c857b5bd2439da0e0b636d0b3ab81fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "3c499063b5ebd8886ffe6b606362a93637cece1817bf74029cbb52ff52b9cc4158f3103823840c2fc091435d2280f0543cdad43e18aae663c632b166a66134e1";
+      sha512 = "1d134ac3f604bdf5a70888d40192633701294fee6d1441469cb51315d6a06308f9c35848d7629c5703e6533f0c3b6d2665a15a2f97eef55cc713c171cf8596f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "86cdd766893f861996615be611eb46e5548d3eec849ea49fbeeb19969213dba5b941160b9359aa68ab99bb9d11e3c2a775e2ce57e0a737fb936f5dd8d51095aa";
+      sha512 = "805779852caec7b5700568fb422162b3adb4c68dc8f3e1457766877355c34f4c0bb6f5032b5e20adda8a99db8bf0385bfc1442feaf624fca24f5b6741bd0fbff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "514f490eda4ef7e48fbcfcceb66c12b05b1ae42b2d902d952be03b36042b8219e9f6d652b8b59caa574829fd0a78ec98facd5170ce07c7dd93cda60d940c3dcc";
+      sha512 = "2bb5382a81c1f26bbdf9ac224fb132cf0384231f0bdd3e4f428deda1f61acc2dbdff79125adbb7b13f1f13d2b0ee6c0ded37b1303aa58a87d98e1cbb7e80fe02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a70bc94560f08257d5d5f8eeca705a2c9bf1e2185ab8a60c52464a2e02dcc49e4661ad9c8ffd92b6cae4482bdbd1a764220cf718b67d4763ec6a8b23259e72fc";
+      sha512 = "5f3fa574a1f81cd3567db4da19bc1925abb137febb65da56dc18535c22b270f193877c8c486df02c547454b72b0b72c5b0cb42c26ffa7c3f072bd5b6eea542af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "a102200f33fc71ff3a26fc0b9bb9d02d63c677d0d9ad25dd9aec5da26e654c8853cd892393bd9b8e8ec777241e946f9a74cfd7b17d8795c38224ebf8421cfabd";
+      sha512 = "53b3cfb12ff230336f96af103b2b18b676b2283d57601a97883de941f1bdcd0b05451cff96c345d5bd2491fd3be98478ee0b797bcffa50ebff54706f84de761f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "f026cfaf289d7341f70f2f17a8ecc8b2cacf7a2e71004c29419cc7b7478bece21c77fa83a6a6fddc357617b1f01759ceebd60133e0581f5bdf9adb4e76cd54d5";
+      sha512 = "aa61f35cf869d383a0752c7502e94a03f24b1f9460fc0af950bc30d02c7a48e0bec4f21e6336e4ab897fcb566faaa79c56dce2f29b4c66a280bb61ac4a16c97e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2a03327b2019276ac598edc2b9bc9b7d88a8b9d3bdec29b986260420fe9b0081d11e1f4b93132edb17b537870de91dcb78cfb338e1446df97932b6764f4d432b";
+      sha512 = "a3b69bce98be7ffe94f7850bbd10ea8bdd7480579f2382616f3d4b491cbc88d0b74f0ba84ee36f407bf6ea1de9849ecd182d5486470be2cb23723e26da11c2fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "f7ce71395347756e2b19eb3596d45d34d05c4ee8df30b69455e8ac5d5b1a4b16efd8bf8c6ce573f98bf46079671e3ec9aadd252015f279f6d9449aaab396db72";
+      sha512 = "1e2c63f40827a00416e663ff601a4414f0c2f0123dfd53af4f74b0d9ae82b1805ce124511107296abedc95d921e306f8a5fd516f669fb4fa3a41bf0619654ecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "5c86128042b6da5cbb54f374c2d76833ae1eb99cea48140f3c1aaf86c0333ee51f4cd9b33d1fd37815dbf1cf1ee779bad3bde13dac0c16db99a90df67258e481";
+      sha512 = "cab4ad092fdea3ff0e109493a21723e36bdc33e508195a53ea1a1f047dcf6dc3428b94f58fe5f00c87baed398fe02545b13c6852f8b15cdb777443793d7d0f38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "15b54a0d8114477239234833524c2a0161264b9caa6b2ff9f9b31656a2fefd3a48c3b251026b462ef6a8adbac6998076ad7e040cff592d7da23d6651473b379c";
+      sha512 = "c70d0ef9d6ec38cd2dc5029436b9125e8ccb44a8da340bb24094b5d39b56a70c9583fe13379ed82c95ebf3a547886a22e89cbe9ab125ed0765d7998519b95695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "647e62b45aea1a171fdae38a3010cd33c39ab1baa5553247723bbbc33d7058f4bd1189418b8f7e45147abd5f21c7556f2f101ac7d64011991ddc55df3d24a925";
+      sha512 = "a0f75c5b3615fa714360f436771f0a05a6afda2d9375a8392fbc87b5f2db25dea1f70e3dbcc4ad7a4298ff63c7a86bd1ec7c9fe37289b4135126859b74ee887b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "af858031e0c29ea9ca498aa28994e2115775de73222700ca24ac728c9efb50f19211a7387419cd034b900034ab718dc76ceaa84bdcb9ab19f167f952904ae6bd";
+      sha512 = "14b60dd4e8e0e53d250ab42fda33ab7c5c46699538015d055956db97ec6c3424b92518f44fc7b620293425811326b4cf22d1f8108bd60137ed31268a913a3f9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "7b72a34a86da439c7d36defce600ceeb09110e89aa00bed3969e4ea3bff1acef8015bd045c2382061f6646b8c1bed5a929e5e746d770e79a316222ebe67b43e0";
+      sha512 = "9ab7752b05496b35efed2e32630c883d5c760f579c8733b80c3e5d3c6dda958856ff33997f5dcdf1e34276fea1784762aecddb64cfffcb2dea8b0c09e4ef5ca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6654a20fcad60fe82c9c50492bd3c72bacb537fea0ccaf56adc5654cf4d7db457317a39fe5240df663b102e04c97b8457cd99461be4820e0cc97d70a2bb50263";
+      sha512 = "26eb2c42b5b70309e0c039e67005fd45af08eac5f47d016179571f30288e5083c0aa5b099a9c6bde611fa3b064d9bd4b81af16618d516cab45d09f914661332d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "2cdee47248b65a82882070b02c9b51b8ff2d496a92781a9053c986ad5aca22fede9bd967a2602a0475aeb14561bae6d1446c5301e999aad163054d6ac935dded";
+      sha512 = "dcd8853c17ccec0b6db65d1fd950ae669a260a3860fdf128853af2358d1e59e968c470a0e1da087730d6a5808648ca0e9a7d922cd8478cc10dd5e4a1fc15c268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0b0fb41768b0a317608a23e200528c9ec5855423960c6e79d75c37bf0edecd1b5145c0d7d499645ed6faf0b927738eb33a25bbcc10e9302826a3ee79b39daf2b";
+      sha512 = "58bc4d24bf787617c9adee99046e1991572a71ad742ab0912b49c8b9c393472b17f959d0fd155c51e26510020a1ba71f1126200802a8eb29930741a067d5cf35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "a824ef6e7f3ef1da11b158e94b6c2308ce199f1db4a1ad8598a5376824edd785280775cd26c31be3eb2d7be870f54180186ae8c2fd1fbc2a2d2b196e3e2e564b";
+      sha512 = "0dee04349296fcc57e3c8438d61e38eb9909833e2a5125e3ce9b13210d8158a732b24c9149ba20132bd4b07f9b75986c58a379b22497d1148cfa051ddcef6f44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "86af05dab09f2fe192658e7676a035deedc2104118aae427a0f6baf29c3cd04c56940090c9918860742cd63d9efba280bb8757403d6bf22f35b8d977e0b53199";
+      sha512 = "d75b85d0b16786658c7c81386ada836abd5956850d878369c08a9aa1075a7d73167ee1be3d740dd5730f72bd6859982be56acef898d67ef3431fbbe7b2180b2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "1be7f111093d519bd06a97ef31c96b44f4ae0beba32cc06c9bf636540a48d27191cbab1d8849bf11556328f9a4127715e28136220f5029013e423c1e469c0b37";
+      sha512 = "24505cc22b65f389071ccf9deaf5694a931f9fdef9e3e0a139fdf1b7343b16873b6f9941a3194ee113e2f0aad2efeaae425da62e0e0e9f02a31771d3090c20f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "47ed1061146f7d07b132b805066e8c02ba3cd91b2d278cf2574a9d1ca61a9454ab7dcb2b05c231437fe0da34a5efb5f8e013d27a7351383d093cace38b197bfa";
+      sha512 = "84597be9df488f0f269b93f54412880662b507bd9eb42fc71ef8d2029e69f25da5592e39b529ac8c94496a37aceffd292a05e38ac51ebbd242d6afadb9d7ef3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "1f020cbfadaa52326b677d72cd83d77e783b0de10a78a845ee8ae3c65b88962a416cf0396a483885db64b6574ebf77130a3ca538dccceaa94ee0c6cf23f79f56";
+      sha512 = "e67eeeaefa96bd59159cdc95ba7eab27144c38434530cb4b25949016b9a39aa09e451c4199450fe1976981f354bcf7724865e28938964904d652e76fda4f35e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "9fb64b729c84ce7fe66cd7949edea48d83c34214ea78028057302fe2aaf0dfdb736b7329168a30fdfa8885aae08d07d51b00e9355b450b8fdf0fb670e778f54e";
+      sha512 = "535a9138633d8cc5362e7f42394252e95b332d6ee35515a0434aadb58b0b7ff359e1e2b7ba7c5b682a4f11f3361534e83b3f10fc7bcfe766b8ebc54b61b08ba4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "74fe673825524dcd6c0f86ec5af895b8b4053cd3be413d4ac6cc5dc6a04975e47f0fad300f7df128aea082bb5348de400322af554eaf007be6340ee2000775d4";
+      sha512 = "f7d0bdd4afe35f01ab01c1b846ca66814e83a11155c110f08fd03418649bf478996f15b8d7990aa3d77f2fd4e2f3b2b516b8e1c34f304e105c05a35989b9880b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "c2b695c0d50ffcd0a796799a230e18c221d26c078f268fceb2439cb02006d6e41f537591d81726f3f26205bf4e6018b70635b701584849c015a59cb62e84210f";
+      sha512 = "8ebf14e8e31f602889a6022989934e1842d7f3c8b2682ecbd86890fc9c3f2acfd8992a7b2a3dd2ed5a4e0854622c0041e0c4630f08afe800b67254dcda2a1db2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f997f0437792320039dfc99298bdbac3156a085a1e2393ab2766a8d2c761cd3e646a25348712e2a2220ffcce8191adbac0ec568a7441c66e447bdc1b1bd600ff";
+      sha512 = "e247421a99dce2fb9a1b6ce1ac11a3e9427dcf56b83719e73a894036319af7404b856e70b5170c0a9cce1bbceb99e9aa3d47310a5f0bdd48afcba0023d77d4a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a876169ec8f6f88bcb156652206b88dcb46c85b1cbbfdfd363d13f7e6a315ca4cbac598b3834833f5507bcbff2eb6851781900a24e6bf56597812e29b546dfc0";
+      sha512 = "c9e134eb933bb3b176e229748233cb840c690720e932fd00877e0c1cc374316c02837acdcf132e687e00da50c922545bf643e37fbecd37a2493738987e36d98c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "6a7dbf71ef0ecb1fce9a680f404e56814004e0e83fef5ed02ad3f7570cdc63ca3ef39a30543ba5bd915ef078c0704629034fa46dd4a853937ee5bf3e096dc205";
+      sha512 = "3f574d2aef865fd60b0a8e2c51144c27eeac6ee9258a6e97587ba3f38c8fc0759e636d6ce023a48ed6136f6b06a913633278534c3b8bf2b9c82ba86c696a2b61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4974af183667222f0868500979447742e520f5a52feb1c688c321553b4622855b18c622b7010868db9e30f62de7efbdf0164eaad032ed000e6502c4fa7e4edda";
+      sha512 = "12cd6a2918e9f27867fc49d763a24560ec80b57093669ae5604118ff940fa772a63dad46b9fe4c88486b4e465a4d63a312a9734137095f232980a29debcc08ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "7e82b2a8f43459e3a11501a81b205503e2cd98ef003079bfd869c81f6c4156666bde1b8d566f2988bd7407da566573b2046e08f7595c8e52907be915aa379e28";
+      sha512 = "273a2724765f6484d9712e58e24640f4c286f209f1869f696f43eb219a2b474cadcf151b5af72acdbef0446cf345fd8633bcaf0d20d8ce43a7e3e27b735ff371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "48a82ef0e49669f9f3a0bf41edcdfc126ce0ddf805caa10942366b9c0a26e016a938157de7bff898c852b7a263aa9e4f5c8e916de33cd276914244582165ef91";
+      sha512 = "dd9e0544a454208c49260f03b1016642d05efdd89aa8e58e5cfd2d2ba2ecebdfa4faca8ac225a0072ab0995673dcbd736ba178a04da11bb790f2a82bb2bd5c42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "3ea47df66ef87ff581a187d7b6b1f3fbc917e6acc7a9bb2a66433477c92da15b92117214f8c6e9cb401e1a7f3b7ee7251229f13e2a3030445bcffd3c8b18159f";
+      sha512 = "88abfe08ac9d415f21ec61d54242fc8b19c45ce549f1a09ee76c8bc3fcc3f69b29fb03f1892b52e924c5087e5f835e5f0b7e10cbd829b484d98fb1cf2e4a16a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "43a0133a655ba59b72ef5d8fe3e3fb9f38de541c3b9f91a1ca259292f53839d95d4990b09411289b9d7ba718b02e0c58fd5de33db2f0e6a7c7cd39aa8b263a6f";
+      sha512 = "3a56f21e53bad283b76f7ad6ded6aeea44f06e2694f078a39d8bd898f3965eebf0330f7a0a09adc37a0fa39e2a123108c8b7e3942c6fc1c402eb29ed8acf021f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "08c1e4375806aac5ad26704db8d76f89a380c53a1d0218b6f5a17a4a538293360d3e600c20f6be219f39049d9c049cbbd2294e3bce71d42efd0269697d1b049c";
+      sha512 = "d393d86f05975163609c1b878d0d9a88398147788c5e4c943502ae0b892bb6a7677a32d66275dd116ae9fe6a2c8e205530b255c004b63d24ce985700b328bd6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "773e8b3876f6256f4c3404a019b9c2b852143ca5b55d13afe61e6f915d8aaad45c665f8fe683bddff9ba6680483a8eb79662f7f9261ee162d8fd291d725fdab6";
+      sha512 = "39b50c156f561436af31f728770ba114c02c4006a078453b9e5716d4973d1bd8a470e6184344715d77b3b9c978d23ce41d86cfb958d26efdf505cdafdfd42359";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "95a4c05781e6813be233ab7a6dc91ce90751ea07d6b7f565d2b1580e4d18000341822a3dcb1fb4fa2656badd3f1c24dba4af094b25251d7050204c63ff87e74e";
+      sha512 = "886a9c9ed15c04766e14250a244f10abc6ec35d65d81a7b89226425df7abcdf0654b23d1fb03fc94a4d38c7370ae16617142995510ab9cc91142e1646f9f4458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "cc60d8d8bc145a719f81d8d09cf8959a0f86275074583c2c0bc742df020d0c43e28e4e5476d49309584795a2273006b37a04b82c1615a0f203b32ddefdca21d8";
+      sha512 = "f09f8b374e34cc117978f1293e1216774ee6981f00b0e1754cacf9de52c693bc0196be1a5cf3e8063d69bd9784892edbc3a38b6ced06633c9cfa99eb12be76ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "9645d08f6fba1fd60ed32e20c4adbb509b068edde2ee827814e979e0c0d5b06c92b2fa102a41b2da7d386772f0fee43804faee24a2bc4e29452b814d6ebd3066";
+      sha512 = "c60c4bed569222f1fefe97f519edcfb3098ee2769addc6233da16c9ea49b5192e5672adb72a12de0deb00dcfb033f4e48435f9048e27477caef749cdb14bbc06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "292103b10479f6d2f570d8ebf10df1b98668f8a3b416b4385035839bd750bcb254b40055df57fdebbd22387744cd9e5cbf1ac484d4f507d5fdaed346d300fcd6";
+      sha512 = "826c3a6727894b521ef6a5960e4fadb230b51c1518872b1d9bfd99e6b975431bac992d183060d031c378644112110809faeb92d2d26aa9326a2ea327d7513d08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "70f9d2062220edb81c28f4d9a75435eccc82b9c771384fe8ef9f3b4f7e1a13d78a5e311a9f6ab165e03b8092d151c9a43ed43c19e00a1f62b43727008ebcf725";
+      sha512 = "df9b791279f5d0ffafc48489095c7847f003f007a19e77af996fbd6ddb19fa79ecb8a9d07bd98821516dc85c78ba7c628511253311176e8a85581d28c7fe52db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "91a1d540ee0ac0faedd9254c6336462ecd74779116f88f9954df8a06cc49236dbc343a97ca2d971d43a83b3b560e18a72c123b730aea474bd26ed4a3932da113";
+      sha512 = "f8751b0908d220ed6444c2ad6fa5a2070ae843190bdeff9db1f032a260a1b5e752703fc4543e91a67df0b12cf62a7af22804b74f1004cfc4bbbe6be4f28c446a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "701744a3c2244d22d5a3b13a909bd4aa8870103d9fcd1ae6f5201c9575a815968991a9caf1ce25f2cb2b5b1005ec0dd0185f519eb13793b3ddbdf0cf1bf5ab77";
+      sha512 = "0eee3e6e29c408a1e14da2c89c5f14f19b0d2edf8ef914d132b94ed9685a09c3de2908c8ee0264eb2564b466cd8779a58a0fd4eff38a2a8ae73191469ce327d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "05cf372b240ec992afbf0671cd4885ac36ccc37b10f68c9e49c75b5fdaa9de72ccbdf9d33cd8c37db34e971ebbca2a4516dc9e5bea3985edd89e1a07eae006a5";
+      sha512 = "3ec0feb25c12cba1c1641b5e91d79318f81c1fc635e32fd3ffeaef6acf0fb55d2c5c8fb6917175ca0ea6534a74469cfed283565c94a1d5a87f69ba70f9d25a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "d87fcc3eb4b1fcb35faf144073799386c36b923512c269fc820ad3fbb8a513f80a9ac4a1bde88f5a82f2d5bb51b69e9fb8a833b0c585f2e9ab43d803c19bab82";
+      sha512 = "4cf4521fa259ffda0b71bff3c01a1296a22da00844e3b357a2df2442b9129ab19027df8eb766ae2197d8cfb7193fb8cf49cb6baf4f32ee9b0264c85763a1cb0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "fca8b0ec89124fa23d9aeb2902f6007ab671ceb916e63fdc285ec2cbcfbd10449d9f1aad10c8d8ec98bc61a4c01d96ea5875ec84ada60f43359abe1254930a1b";
+      sha512 = "921260f5dac381ac51ea859515e7016f3528c9e985c09566c06342d225614878cf25eed6dd74ffba9d108d9cbcaea7c44852d3010493d7586ce34ed1e0312315";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7062e6b55615e365537e57d4bae648cf5ae16fc9cf675dcddba928308935ee36c71b90f5e5b13108d20cf370fd7306f33667fd3e8a670281787d958269011b1a";
+      sha512 = "31edbc72aa5088466f49dbf28efe97484000cc7cac1d84c14fb22af3aa551f378df04c8f08683b5a1a690e6fc7d6c061db3ceb639fc94ca6d91245de252bbb79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "04326831442d26752ce5ae4b853606259a7af2da1b548a4fe4fa287af06460b6231f753ff4daa8e1e57e5d4c86d1c877f4319a441870dbf02ae2f47b2d0b9f43";
+      sha512 = "db1ffa1be437f472100f748bf09f2c7d8fd82554cc04c7b95bfdae5903c69b1421eb4b35d67e7fdab9dcac6780322c1cfc55fd70fa12dfa55980c2344e49218a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9553f112008640c188fd524bda7566d9fcb3d3f34d8c1ec5636c783ca4aab5e899ede66b8ca2d0058e53d6da791a7ca329ff5e8dce29565528486a2043807d22";
+      sha512 = "c0bf7cf8fd9a89871ee57b3b56a1c648f89cf59425bbf8d95e9b41a13040b06f714a8fe2cfc99379473ff925ab4eeaaaa618685843e7669c9a92c66adf9957fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "cc7964535193e6dc3047b2c644050909e131b5f95db88f2b288a555314e6a4addde51aaa98789be7d4dd8207fb5cbb97a263728ba5405875ad450ac216b86e30";
+      sha512 = "69853a72eae2a40490f5005cb7666586025eb481f0be8a5b2aaa66f10b1bd60d66185b34a24b76932b0f2b551a79a832aa3cf7997ea08f038e9471bf9310f838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "283f4fd6ebdcccbb4bf9a4bd7db7e8fb2a5946deb8b4e742cf29ccfa652b46fc436576eb7f7955a2edd1eb9cc788841369b0bcce491b7b1ec0c3d353d58f5267";
+      sha512 = "f5605483a35424d0658d3fe662c1c50371924a3e51dc3761c2a0cd5a91266d95421d2ede9f5cc0d6af93fb6ef2abd8a15aafb0bbba724c37241c4b3b16eedade";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ee81f13e790025a12ac7c98c063f448722ee7178fccbbe4edc83788333d3eac50f9e7da95ccb2173b5708c22e96cfe3a8c297b251d2077eeec11212ba0dd9c17";
+      sha512 = "c1c48e1982a1961755a336e804bd1b40ced909808557d4afb3cd53761fcba2183afef6c91c408ab53adbbf39861438a7f3ce728323c410889d2568f90f4d1ec3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "6d66df340b9d43065ed3ceb67b74a59b80cb341ee3ade9028affeaad513a14ee81de245d8dba04cf86b2323d32e797613d8c20ce338d5ee0866893d21729d997";
+      sha512 = "947d68caabde62361d7b4e5efb1550d963c3d6795d45301aadd36d31952bc5445e6179b5db6a26ede685216ede369b2f486e8945fb573d71962569554d1b19d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2b391c7e59cc051dc5c3cc2ca98dd0b9085a22a69aee57afffabe3dfb640a132a8c9a79097b58934931ab72e856300b00a9f7261e0eeab9eab483fb9d8b9bb7b";
+      sha512 = "86e0e12d63d3acfdcff623492da49ebf7a405556fe57289622910097847f8d64adffbe27bdd2de9954431af7a4516feb692a4f9c0e79c46ae1eff8b301e36870";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "33bd48973ebb1299a02248dcbdf31bd070e0c8eab0d1bf43b512cafc3b4f9267bc3d687dd4d2dd0c4154415f06ec34a07e17e85d96a908b9675ad4087ce0cbf3";
+      sha512 = "2b726e938679f36f4d6fceae5f12ba746468b6f4cff03e29c1f7d52ddcac75d380fdc8d780b46be2d2a2581ba83278fdb233e9b91e42a0f68e3d0ed784e59b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ed75d79135390ebfdfc698d5df6292f4d2cf4ea3b99078373fb94ba95042ddda174191fd6c9f8a092a853e54658eb001256e8a49cceef038c4367ea5ad8b06b8";
+      sha512 = "49c991aad99f32c3f1901af207ce62d8a2a4445fdc5d6b06ba47e2da64bac7e99af80a330f03ad65210a636230b1099fcdbc0b526665f4a8657e529b1c3be102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "2e82f2c0d76678deb54e984f2c46858824d23d47b854f0e5087466bca71dab61acbe2c2fd3ec6cf9788bcbf2959abb45b132763619a2ff14dfaf802a1f0e46fe";
+      sha512 = "01344f2ac444d9d7d87da48335d3ec7e4456e61062c3b9ce9f398be2fbe16aa9ddb01709358642b7f69ba0a6d987093e07022d25f66319d2b1e2b56a2ba3865f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "189add8fa9e65ed80b8c858225eeb6e0a9583f3cdc17ad9a61aa226a49ebcd63a634b0c335703a112a898ceaf73206ac0c8c7ca43fc28487dd657491bd601e5f";
+      sha512 = "95693deb31f66f6d8303c0f34bc003903322adf8563d19ee0918eac00c83cfac7911d9b11c28bf7eaa5b8b1b08f8a90cc248a8639f655978cd9589b313aaca83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6981a2ff3a06eeb70f95dbc662c91695c590650887082b77b634de09d454f3ffab44e9bc11794f2d24e6f71eb77922f4c0c8c2fc0bb529900dea78b2f8630664";
+      sha512 = "26cf1ce58796e570317e693b30658e3b423f2ba2a1e3614c3ecfce0b0de8aa224cc1b6c6cbac161763bf0ae8d3594b856ed15a6a40bf1f159f7d5869178eb4aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "239b650c9f4a8b12ae604211bae3ba80aa5a9de4a3d0847945f82b359feaccb1bf41a786f43411137b1b15e6f732dee62920c929724241b8d93c5d4a6fe7eb02";
+      sha512 = "c835c1f3776cf34d0fd5f626f61b57b70a200215800634010fcb758c9ae11df9f989c618682e85bc04936f83b105b30cea39a9cd350c6f9d6364f2a268a56b4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "25d012726f7e7237002d1831f50b7a954f56771954b165a11b76ae49be1f3a685889570dbe905a4a1c1243220468c20e84fb59d898b04c3ec200c70ab0c60a34";
+      sha512 = "d63731ce8920ffab15c23b477e9bbfe9d4fd8b6202f329f333c557111a21458aca6fb2d6573bdb5c83c258092603ab105e43a5c8f890586fca7346ec5d468ef7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "b4b9daa4ba7bd38dae2340f14348b325ebb4942ab0417d507a63b2c82577a12315b0208de17d5bce41a28ca352384cb1b411295f5a39d3094b7165e043498586";
+      sha512 = "0a592487eb0aaafb37b8d2a27cd9f7a1fffe215b5a04595dae25f2cb8f309fa17ab1f642be2bc640eeac55a301ee75c5e7a25b10b3b193ebee361ec9e4829b39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "3625d7417e7d13c5af1eb3e706316b209c1d09f90679de5c110dd5c7f1d400f325c12ad5c8ff0aa50ac11bd05b4998ce574880994297b27bd0168f45f74ab7ce";
+      sha512 = "0c4b2c54893d3398bffdae9a3c0cd6c61bb23b11b9984849facd9b17221b065e4527289ece0e1ffa731dd9d6cd0f8c75ec884c47bf41c072e72251b33eb4fa17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "69412d0cd51ad26fb18c27e669bf07907a9d544bfd64edb3075040dd33cb3f950909ea78487d8ff4593c9cbcf818db24480fb12edf0dc483eb4da4f2b92228b0";
+      sha512 = "b1bef0780fd17e0e6ae543c23c6c9fb89c500b0668b30c4596cf340d2fa5bd2663bdd683b18aa02de8f7945b84a23d9b43e71b60a5b6b6142996062e72e20df5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "5ed247fe6707d4f9f0d0bc9814b7e620b01960c291ba959ba4928b72752b97b2f7645b822a4fd5a1512d7b9a93e2c94f673569593a3c9edae342cf18343d5240";
+      sha512 = "e80503ec40fe25c43b622e4542f6a011d2101a8cbe9452b2ff17ec584422e3f3e0ce962b441efd929c764d69c0ee2a8f8bd56d62bfd3ec89c6bdcb1cbe66d12a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f2fd813cea42feea6a82df0c9501282930db6482374a3dc3cf09f4d99e59179e13646df2419428ff7c0823971cd003f1b2440a8295eb6900f43c42674e1419e1";
+      sha512 = "a3aba8b75413ef60a379f58a4456ac5ec9e67c3b5a591b05f86252bc12901140a5e84975cff07475b3fa03fc65f1141e13c9538d1071a9c39d919c484d36d636";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c4fc42825650e69a925755f8bc1280e873f4cecfd9ab8121331daac51b7f445f9f3645d3898e73b81ce5d38c5162d396437f922817d5cf7f504c394da420bb71";
+      sha512 = "79e5bfb8a3db4c22097e3c7edc71578da7db59a64f66f9598f3c49bc619c83aa94652d9fdecd2021696c22e2301235cd9d83ed0000f48d30ae2a1be7d0fa5aa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "f914083206611d88b7dda7dcdd8fe1ef5058f6818a56ddd3e035a75a7ebab0144110238defa53b07e250369be923c6f91decc3b2877e3e1a07f3c0c4e1b98491";
+      sha512 = "5405154cff12e11f5cca920e5120661884185f1972c2bcb79a61be5ff49dc2359876e9b18ffaf6ec4429bd13f787b047ff83f1b0061d6bcbe94f9add319a7f71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a38905bd3bbdb6f7bf8113c5be14159548505176c84a336da9839b589f1ceba46aacc70cbd3337e740e15ab63076bdb10a3f163b45e62d97a33eb66d5243b4a0";
+      sha512 = "c3ae13e279b9443418307e34f25a0bac54844d70edaae6d7e77a370197f2fa82608a0f666ad7d6f59830ac7f0425c7818992ab4dc62ed44979b7c774e82b115e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "1086f3a59e2be3c612b6262e2bc0ecbe9db409d08659bc8c92d0ce487ed77c94d1dfc6fa9f17f48ddeffe7e1403d6ba4abc098f35a28431f43443ac3cd8ad565";
+      sha512 = "aa91fa31a4415d50c8f3b73520e4bfbbc4e520c632af1b7b8b7b45e9bbcba1f29d2a18df87c2296cb0c6471741e75bc2b4044c0e1c361400b51c20c6a0baae66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "374f288d0317c4fcb65e7ddb7bc2489d1ab0eb6b79d5240ce27d7db44b9ec7f2184588a148ca1fb6029e273e863fdcae126f76f2f9625f278cb9e89c37b5075a";
+      sha512 = "f655ed4d8bb895b9e966aaa4f95eb6cb9a450daac31a164ff0a8107f87a460a40fd9fde913613f7099b601a003862c33e2af0eca0eb75936bc767f0afd826b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9d5ce4842e13887c0a7e4c44d641cd96a6801f41d4d5af1c2bb292aaa1fe4799099d832abcfb7e4dffd3e1c40e96f4dfa063bc4090de63e8a1e4266a6343531a";
+      sha512 = "1f2102b4b6e57d75b9cebf0669ded9f3e88de67b545cc95a7a38408330006dcdfaf206b792f16e94c6374e722baa77733e64255eaa6d94662df0352852978d50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "997550771ee09dd150b7e5ce97d7a1db90e2d3bf258a23fb0df089460fce17157159bfd5648c2095315b3a383b0bcecf7506744c84c27f8e1912f34a11293330";
+      sha512 = "9971127f170ebe9549680fbb22ae1ebdccfa52ced00b5afd20d14c552f3c5b12754b00552986eb1a658515960bf71cdbaf5f85fbf9dfcc059ab713814460630c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2bda72985ca5619da9f63b760c994e3a25a1512ac586f8692a0ec27c3e1be63e315376860ad5d8be96ab82de2ec4439effd164411eb567f4f23c7a31398907a9";
+      sha512 = "3c7f660809598f80116f8081d7a7f3e1455739e65b99a28a707c3c93a7dc2d0023327c5fbf9bb0a8f484ad640b53fd9356a8e0fdfc5d3c9ce4f3c54ad47983a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4da0289b1b5461d51dd0f426d03203aefa7997116a760776f81ac10eb4bcc4565755ce0c6b3fe39dc6681642526b06473172901f50096fd61dd096ab377b96ad";
+      sha512 = "4752405e671d48899d9cc306555d40eb2eb5eadad2228777232c7c12d26dac1dd60eb66758df012fa5fa58366df65bd33513eff02ab7592b35ce605dc2201ab7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "58ddd47f9af79f474d4bbd757b28dd6d602f42217782891dfb62c8947fbe82270f6e6b1c3ab738847ddbe41b8b3b9c17892c47f8034f3764794e20700d4d5228";
+      sha512 = "2dd94e26837bf9f52d80480069674d54e7851999f89d36940249475e7262eb66c2f88b6776b0e798a45236930ec4eabcd818b9ff5186ab4688959bd4c120e8fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "8fa680b3e2603c51ff081e196be395e88d134e02bc8496f58dae077003b26ca3251f1d3eb629ba6073fcc3a4dcfc883fe36156a3e3cb4ca70675d6f038be13eb";
+      sha512 = "788f0eeec94ce2506522eddc9ecbb4d1873003fa6813dfc419819d3b957844b81af98f01d686d94bc2d5ff28d075a999a54caa27b07ba05b3707edd9b4b967f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "5ced28dda01e9fbc96cd430fd299f4af72f08bbbe084ba4b845ad05158475de173b4383b96a237f02136c6685e3501b3bc7898f7309f7e014691c777c496ad8e";
+      sha512 = "84aa33cd0306c6a8353b71dae4528752639f408866c446b03ff8afb58842d39cd3fe268d9c3209d1a5ce73a2168eebe307e4b82b11043066f39c67f526afa53e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "137da2206a0147542a3a47977b308578474d0bb75d295d224bc5e563f7208b4e80f63489538e7eca9892d88b7c768488c1f12f2fb2579303d8fdec2f076e765a";
+      sha512 = "39ded81264e7a0b5f52953130deabfac540778cdcc08cc9d0f24429d69ff6805a9ee0a853f49f235c8df84093936df8907daf77ca5c2cea62b20bc210e9d8756";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "06f601898a4efb59c1d9310e0bf3be0e84dc1d05ab61af99f6b8e1871aeab16ace40ea8828e3e39ab7a294b0de6a24e83a0e9e3ecb383e097c87f6abe50795b1";
+      sha512 = "a3fb3ec97d4367e27cffb76c457440a5727b67829afb1a419e02c18b039921c66ad8db96b56ca37488b02c67b8cdbf5db211d03bfeaf65401a84cced13ff36b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "16fd044a2cc66da7d6c15725bad01fc5ed0f6b050fa7bb5e143d6f7fb92a0fc39efe42c1b5f65c829e6f5ed774c3a717168e17d11634cfb74e1be036d39902ea";
+      sha512 = "8723521c46a18d0c1649d2a0af7702a854e12249323390d65638424fca7dbe72bcee4e9c8150bdace09ed2f587db2e02024f5fea645c933a945590ecd20e8c48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b443d6e775fed18a1b32906f9b9b3f75989d24febdbbcc5430b4c58edeaab7a89aba04cf6393cad440c345d0c4eda3d2ff17aa36c84c7be64afa8911907dc116";
+      sha512 = "c70b6a7cc124a930bbb2bf74652232b64d05bc87c625e49b94d1d9b52be85aa56c8a0ac8a2bdf50b90ea41a74728c19ce5ed3d9fb11b96be29bff437883401f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8b1652740bfc5eda8cc7b5e4de0cdc696f9ee98a5ab3b7a6479c8eba86158f3d78d28521bee112fb7a765fcf52a10b6e0291df8214df83c5ac9ddb80d72e2560";
+      sha512 = "df9e5518ba53314f8bf3e99914c2d36e1e3b495e0333ddaed3bfb5c16a75ce2a83369a1247c2c7f14a774ab0ba0bdb92ae1ee4f25314c68f7f6e3dada4a10b8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "3f4defe35e81d56e16fe86a6786ad6f0ed666f5cfc74ab54927f51ba1556a3434792284e076051d6004929fe31c7f1f7e1b3e740e89abe49307c9bbef1f16000";
+      sha512 = "d9ef63ac6c8159cad45147ab8bafcc73577a111715741968050c71ff33d12c98d94189a93b461b75e63c0679fc9374c9f997aac5fe3398c49d3e5318f3fce0d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3aaceb787cba83678dd331576a5cf6b426a62a5cbd136bc94e83afe01d5075f64ad25e5306e3f795bb3a691e9286dc352b8318529b90e83db3d074d33c2eedc9";
+      sha512 = "5edd9666d324f3cbb915761aed91e3be5d297ce5ca1e77c793f1bf8d8535083eaa36537fe9ace89ab1084879cbf351f77780d998349092a4333a34a0231938fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f90f63ea681b34d340a93895bd8e3859020ec8773106d4b814389bc1cf0e12f1c79f177d2946f2e221caf548fb97b2de893e3715691ab757f5c67882600f61b4";
+      sha512 = "96d6be5f3dc67e0839e1afff60e3bc756fbbaa04adf2e3dbc743f94dd039dd3d6fbb0a14dbfbd012138580fb32de7f485ce0b1782d43e24551bf4620c246d18f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "16bcb13802e99368bc4b96516175a06150031bcfbff27c50cfdf1676565aec60a43ef79416c189f1e8c8eed4c62d3adf00bd1054b8a10b6ca0c9b2988d782aef";
+      sha512 = "7e57727f21316822b4f181cf722cca3e7df7499a4b4cda2fb0e0df2eb7f00a236ff9e2120f64a244ef9c329ec2bbf739a067f0828f4a3f2086497ab9a72918da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "ad4a29bee7871ba8e8cfcc60e3801d402f527bfa00082a1413892b812091bbf80ac05b7ff754aa233cf5d5bf60c629c3c5ae5e2c3c0e43767a80763e96f8c380";
+      sha512 = "aafdc6666a206f6945e73221efc0273f95495f447c1f7375ddba78a04656ef9e84f683fc8ac392f6de711628f34712e0e0d31032792dd8a45f71f8188d5e65c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "ac8f1de37d413f5fcc03dfb32d441632d33000960f89bbb487d9b1cd1129e0bb6f51a3fc89f0cd2e353b123471ba5b7bc7e900f03c3c982f0f492c811132d36c";
+      sha512 = "a47e557b6846abf57bcad9dc67ddadc91f2a37043a8727dee96e8425de8f76625749522b7764144028bf080508a6821b1a6ae0b9691fe92855cd7d34c2fa5165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "04decbb2c4491bcd12f4c256a81eb23fe54ebc45acb286ff6dbf3d3b9c2e52d332fb8ccba52432e34a78de90234438295d1f55d512598b35e557c11e53068a14";
+      sha512 = "a44789be262632f69d12c4f18680c2a4601cb3cc5ee1cce704906860a3fb1f2306b40d59ed551a90d81ff094665f525e37c557b70b61e4a49c32a23a4ba99fd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "728dd66cefffa12fc651bedde83aba4387cb38f06798514dbd5713158da8141b26fe6e8f5192729ac45215ed203480de4ee3a533b4bf305eba17776a7660554e";
+      sha512 = "5be10d54271606b06174bd2035f4be33282c1ab69eceea095c49d537cf67e3e6e918ed604132a131dd783e5787efcac9a0dc3eb5f301c1d2dd1cd0bf52d63a48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "c8f7696e85d6fbf8e457c90a40f155f03e06a1c15958d8288f543df21576d433900277c39790cc122d90e424f94eb1dcfb4926a6b3fd5937192dd9d4bf054115";
+      sha512 = "4e9753d9d416ceaa9b7fb6d3d191739f1e9e095dcb4c20227a851aa0b6a7ac21297d3ccac1a52abf0c5226b9b20702b9ba2d363137fd6c9f44ffbdc497f9d441";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "e6c60f2cc1ef0f8dccbfd2d455cb2ed032e0c0d16c1f271b7e8d371478f3c607e55710bbed1c12957fb123e6692d251da726d25ae14bae514083d47950cb1a51";
+      sha512 = "b87f0e013ea58a15b001fcfe5b41b7adf33d51490fe96fdb85570dc3be6dc66f514def826cb8469a7517b532bd241e79276774f7e47676cc632f36150259da79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c1efbceb88d89fdc17429db4f8761e7a93f283360d31c8e0fbd3bb56065c78c1b71aa47f1a6bee3ceb6104e62357515defc0ab564e25666c6a1a6b13dda5c1a3";
+      sha512 = "4a7a366523294ecddacdab2aa863f06eda275fa31cf5ddfbbebd5cb740399507185134c3950a24183da89f87a6cfffe54e2c934625b384084a424ce150e864a5";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 7bc14c3a8fd..a581f3f48fb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b8";
+  version = "62.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "d897f44172fc411d9632eb5e94a69cd02fdaa7e19cba50ca036135b3fd7feec97f718d86adbf6124ca5fcdb63c9532d709a8ad5b514626d22826d18ba0e3eb1c";
+      sha512 = "d28ef8bf25a809eac59456ae1952cf2f0b3f2e9d3b610b91d7bb263e206e24bb5c553be46c450d7c71ce16f0b65d559796e430b9f0700cee953c891088ea13b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8b544de908dc4dc76e8c48c22a8819082e7e6828957b8cea2ac6534d237ecec19846b8e9e23c73c157a9d55b7122bce2a6094dacdef61718d02485243bbf04b9";
+      sha512 = "3967402c97db66c917ba06f6d2514ed6cdf072a34eef3b6a47c3751f8ebd04c80dfe6586abc7c5430a573fe0375761b448f5d60a062dbf6a3d2f84700924f2ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "ee464edc47530c994196b461c738ac2e67e3c0e660d1bed7aefb4ddbba301bc2aa36aa810ea3d37cccb9b9eb042f8abce4f97fd5a8903b2559caccbba1f2d4ca";
+      sha512 = "1aa485381ada3fab9df3a925bd143742976303576df3d30a7ef095b12628f9d0eb8bd21152dbfbb6d73d2f4e4c1364c3481e9b96a3a003b802c618aecd1237b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b518c82f49efd368f0a0b9605a63e89f50b796906fec1c3a107945fb17c7ed8b902c3c38c2497fe094c9bb8fac019af41f4e2cad95bc47a2aee6d1e7e7777d3a";
+      sha512 = "0c7ae9d3de5710ea08ee80610a3e7b0ed5cd89d1bddf3c64b478a10f2250286b20ea062c663ec5ef92a5e8c3af9432929f47f1b2c760d1222aa3eacfee3f3979";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "d758d992d3ad90e437f7762a23683387cacf04621bbd11c4d4ee18a1acfe9760094416dd374216817dd493b4d1a0da65a74037b7742c14e2bbf8ad566a988fb8";
+      sha512 = "662f4a0a78329e80c9eb466308839036091f31b1f258b5eb5df31f3dcc7b6d0d6986d506392dec30f822c69fc207e5669e77ffdf26c7b7156b42a73e155b65ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "47dabd688b4b2dc3469f1de471be0214db874c5a82545938555bb2c9c92249fb3aec99b7c8a231772a51d5b3456bd67954db8195b7bd4fa1343ea0a1d96ad27c";
+      sha512 = "ca0b3d4722075dc6ebef171bc36e1b4e9206bce04c8fdb1d038b0abbc120671a2ef4d6023bea627f0c99fbffcd999b70634de90e1b51c518d8642892545c29cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "5c0cc8aa893703db2c8d081bd4705dbba18954f785d4974da5dcc2f8038cd48d46bb4906cd5afff66c01982d3d70f0bcbed61fb862c3091f51aed1c7519c9a60";
+      sha512 = "b981b720cb776a8e83953f8e4dac7794c981681d8e6da010f0afcb7e90df5884058349cc6a12d4f5a360cf7f9067b87afbe862842f0ad016697999bc3d94ad82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9f7dc862d2df0698a1b6bc32bffb59abf1cd3c86447c0914215a55eb9ebf91da51cfd5d0f9a06bb6c59e1e8ef787677dad1928db4bebadc1cdbb49c8137da5c1";
+      sha512 = "a7bd1f001152e4ea8a887e685b126bfb4dedc7a30270128d535eedc04dbd489a3d6117ccdd8893f5753b7d5227d4731cbdfa1f7bc292712ea2634006aa55d6ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "80de85a8ac235ed50d0baab05302cf7d272f4c0f2015dab7e3b4bc4a3393a441c7e2386ed6f75f1d40ed16e370587afd45dd8fab67084ce66885cf4aaea36849";
+      sha512 = "a6b5f4d3aa3db7be416f4bb604a749c8118fcdf5d3bf01cc57dab87c874f0f52412658c9f509c2d09100f4cdf7f5b446d11fb45bfea2d25d4e65276f3257ddfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "e9753f0690325d8542d26bba71cad4c43645a51074d482aecfdc40b09c9e3622fb0d288cf82a7777fc70b625d36d24771aec768348ab212fcd85bb5387fe1909";
+      sha512 = "3cf7f43ca3fcb538cc28c9ab7d3d6441f15123a1f3275cc81b1dec1007012a970d18ee52e8b8781568247c5a854aa78bc316656dcaef48edb11c7b6c99874bc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "9768864bc59ac9803995b4ee446611ce1c90bca61126e91a824cd007e3e16e8939ea76e1fd8bfab0b733f2ef4530819adccaf86b34f7078717e732a5dc56fa64";
+      sha512 = "0ebaa8740a3c215ee275c7ea7669ec4bebbfa4a20f46ef4bbb81b51362fecd72fa1d16bf7e58822024b59934f478699114ca744657aa523d90bff6655b776e5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "3d32ad8e5f037b50d6ced03d1747314a88fa52a30347adfd81a3c7070b93c4c3793b71490bba2a839ff188f8b1b674d6fad66cd0e21e42efd2f2e3e202f8f4fc";
+      sha512 = "288ca47c3f89b6fec2312bd254e2d9aa4469a79a767b2fdd9787a7dcf9af589d17a8353a1260a773df63069628b69e916c2bf76c85076f123667f932b16d04c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "30789dc56f2c09f29b9fa22315144df142034993e0751a7b60b958c55de2f1364b484714304c0204dd190685ed4645ac4fc22d83d05ce25a5957afed9a0eb465";
+      sha512 = "1099fa298f51a7f65dc585f0c777c37f49df0b6c1a18265d0f7460fcbe52e791a9ee8af2af37901f3d73c6acfe919a37966deb4ef5399f59f2ae66563a02ca44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "13409ba2cc807b2559de2b6d76d2b40b4b4b412d1ec656c3aff4d78ebd7ade63317c14a76e407b164f4fdd7f992aaf51905e366f4d0d494a5fef3330d378067b";
+      sha512 = "775203aed14e61aed84e15ace9336799873804eee4907ff924a994fe8ba99d4e49960dc1543c4cd70c4fb805ec1474a657c14791ac8322a7d59c824887aa2f7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "eda46414dee9605c4a4cd6ac73ea9cb2f4810880aa0eab08239c46de1f39e4689fe7ef19cc560be42d6733745b7445af4e3be65f65ae99a388d3349437b1b4ab";
+      sha512 = "addc8fc89acffe5ed37f011b2ef9b3f1fcb815e2e0f2b3f944ab460688c99e54c92ddc35719e56770be3426d9380e33c2bff834fd3b327427efd20d8fa3f83ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "7962a823bee7db362bb3d61a78500f52b145e801440caa29382f756352e0131c7907fbc835455c0d01bcd10eac08c4e4edee42f5764097249295d3fc55419a0f";
+      sha512 = "33c038620535a829a445de6f1b9f9d09e4d6078df3c9172c9ce59a27ad99f7416976fead6ad5071f11fd4fb626b36dd269f072c293dac7fae59fa65c1514e95e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "36e4824e32dc9054286575879dc581e941f0c9e38e6b4964977dacfabf7743bf2cb383e04b80ad057c58b522d0ad8792145b9276f69b4b1a8d360b97080be943";
+      sha512 = "5355af8ce344786f3a81a7cb53a316cca445eda21b7d905cd4602436ce3d3635a0e99f1311c47014e95875deb50c7bfefbfe3efeceb3faf57e7276f95aeab723";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "127ed822b2b90c8727770864cbde078980b93a7d1730e9525822c231c9ee7554b5087e325d61467c2d9bba2d96d45dc359f54fbcc522bc70dde2a18c9d1237d8";
+      sha512 = "11a3139618cd5e822b467df2c1e4bb79caed748bdeb724dc29e6a4d94f6fa75d8434b219a3ce5128f70ba841cd30a8c21516840d7743be9f9015dc919251184d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "12f422e904a4f357a93bc0c093cb04f35c3f95a9a98f4658e10c6f3e292b4be3858217f4fd9a2b7c27db307f1bb20e1810868c1af5b04d21bb847843d1df96a7";
+      sha512 = "d4a45db4c07f5fc353056c18493ea5a09957899bdd98a3f00878e82b981385a460aff29b2c66b4b807228a729bd4d810a7fd38cfb6866ac2e19f8187f0763588";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "91d5846862482c7f93bee5ed748e9dd2705242a3f7513987257a8a71093436bc4c24004ff3dc6f5c5e78786ae412e978105732e5aa2abe267bbe7953e2b5d3b7";
+      sha512 = "80e5f2192f0b4c7449bec3bacb15cea21f4afc2360c5860c76be29e65ad7894915f03b1bcd719d228ed7f66cdbeb3d20867dc9cbd4acdbb16b7afaddd56c3887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "74f7bc52dca092867aae77350ed2384e6986869b227e4da9c539170dcdb4319b5f1a79b16c4ce1db50489b4b2dbd2082c9f9038314821dc2193d94f8678b678a";
+      sha512 = "3dc1eee7205d63c7788b1152f0632621e8f85c1f23e154119ac7106ebcb75c807f6f9c534519e1822f7c5c3fa58067f9c5814d60fd1c045169248e189cfca323";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "e7b0cb6bf77280a5f971af0c639fc539d873e50fe30436498d4282b118bdc75ffd3b3a2c982b7eba8085634578f04bfba3a4542c79ada19f449d99bd26598fd5";
+      sha512 = "fe145a9519f1eae0099903e609bce27d59461e3760a9fa11ad9cb5b8b32e2377d014d7f56d275305669313cab3c9085901068ed30355dbaa5a988c9af1e28ee8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "de701a52d04528458e7fc090289729d58335402d410640147261f006c1fa3053eee286288ecdd6c75c9344dfdd25305bfd2216386c2c5c36e325b4afe6f6ac51";
+      sha512 = "7afe1eab3f574a7c25230bfb09ea1d341b6cccfaebb36a659a5f7a1b3c5d6fe2ebf4bb6220cd8aa12159a67ec2cd42d0425c1aae4c5b672b542cd08a473efb79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "6329ab408c0766581b688815e1e03aa8dd5d0675b428145265bf768f51d93e39a37c9e18a224670ae8a44e2adc18fe8373f5e65d2ad26492de06de3ad8fa2bfd";
+      sha512 = "e0840f4e92de51086ec442a048adc62d5222a83e9ac6e5b3833b76c71a8559c764c7d44aa7e1aed24a1f58a3f2e71cdfe866b329b855d3c9f51d69537ab6e9f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "76dca81d11ffc48c54425c48d3dbc88e1256f50b411411c018b816557d855160e09c19be0f313e441b9870848bf69eab4b550d9659e5e118f5ecec1ad1de95d8";
+      sha512 = "7784aa459edc544cfbdc61f8e66832e29aba98883b818e5c304210618a5047dd775109a95d902a9c336c6a1011e0d414f02c43dd7e250d83b096758f2fe42a4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "656d5c21d6bac867bd9dfacf782b740f8fe0d320ab480bbecdbc105114bdc3d072b4c2606ca014012a939bf0825c83f4d4b83486a2ab47f681a21b5cf939e44b";
+      sha512 = "cac7d6e5ff4c5a8c82220c59c835b2852bcc7d6ca257f1c0956fd89c5cfe57da36bdeec124beb413102490c1c1ee135e5d218c14d4b3b5465bfaf75dbb112a78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "26dc9285989a78ad8f3365ede1350c6a88c377d44db107ae20fdd75c5f52a00d42c008e8dadd216cd4c64d512f1f380d5e55d5fde74787983ab305bc042af0ec";
+      sha512 = "84393d5cf5cfe1c0acb7a37048b169b526a5147adfb66f48a288689af06e33f1b8fdee9c01358b1b71105ef5a10f953b5a364b8b4b576969a068a2badb13c6c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "cf0c96ea3d43c5e40dd10711b122e59e898cabf21082783dde8878e643240adaac6b1ef8904cccaecd5d5638d5a0624f09b94eb4357699dd8d0df2b2e45e6b53";
+      sha512 = "eec6a5281fa9ab6fe4066fc7a33ed8a0358dddd627a4e93da4341fc00a56c3a059137d51e56393f3414d9f882dd0a6e6806e43d6bafadcf9e6c19ee11b7153c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a1e95129fa0b4de9dbfee8fae3adac5255a99ab77036b323c9c99892be8f5599160c0416efd4139230701a1e57ca6afb3fc69b162b32c5b8add8cf9d7c37a91e";
+      sha512 = "6b3cd6cc4fee12f2b57853a8f7bcc76f8efd38a78ca93aea98b8e455517aae0ff5223edb54c4170cd80264d3c64d4ea5c9d3a06fd4636a9471123587884ccc34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2d0821a5a2ce8b48bb37ccdb3c49d8094ff071aff6ec6dd21d780d633486daa3761a47c24a3fb67f8e70077a560b980e86f454fcc5ab8136f1c8c13e71e849fb";
+      sha512 = "762f2c4418e00e53aaa91cc1a58d2dbd457c98a2f0b04f460907fa568adf2872ae894127544fa52c16d532e4ae0ab07b8074f42943fe0c1b95f2e7fef9548404";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "58c96be64e4c8fdfc24a2489593c475bac52cad49c7f533da0315b7ca6462cabf703c74dbd029e5b82c9c902a8793b9d7d11882aa4511aa055817599f35b425f";
+      sha512 = "1ab50a62a06f3a27f22d38d846dd1f7ce4c606a0be5ec0f842ba5567c550ff4154e7aecc7e308118acea9fe8dfbe3b26b99286ade100247647b67e13595f1dde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "f3c063f4233bfcc26c1d78d6b63a85e6f967789a950ddf3507181a7ccfef75e128a674b1896ca3d44977cb4803216fd283c35894ef9a9ec22dffc7c9e6b9c54d";
+      sha512 = "834179706c0d4db08810e5d2a5d5b5353c61b359e10e472d488e099417714486ce9388ca2bf15ba20690ded330a876802ca9b7b702e1976ea872ee9b96b9d21b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "a928c716a4e82e197589c883a0e262346cd4c10bc1853f28c8fd39316dff83ce80a4a64f43d8041d7e6b9039656372dd61bb0d07bbae1d8c51cd40b5043d7ed0";
+      sha512 = "a8376236472b3296f858f28c3120d68fdc9505c594bcc11e6514d9255c965777228406f4a0d40314b32bf826416bc6bc86ca72034b10c4bd28599b09abe72c3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ba22c9d687c6001abf5bcbea99964fc0e427803a88cdf11d2bbcfee7b340aabda82460910a3bff0779fba689df573e4b45a82ea168d969b10b2958c12731ec60";
+      sha512 = "fef251c6e44bab8d943b532a2e1e45a8e72df7c4bd260adbd2551748f10c1b7fc008695469e43c4c97ff8ba887cc9f65a5ad87f0f538a980988d6f6c3bbb4ed1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1b1e90240d6e6d2d9fff7852097d64ef10ae719f9a0d9355972be492fefa37417722d8dd0e5e4a1c0bdedce4ce75daa8085991df1a83d05e9bf84a1d8e8ae142";
+      sha512 = "7a2bf7d18eeac44cd2660eeba46e0d5b5c85ed6fd150504e6bbc2e072ffcc7272672854bd37992c9ba33c91dac6cf0b7a2bb32065066c7c4e1c4373c91de624e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d4c3e745da4ded8a79910c66872147e15bb33be7920171ec44ad1f380884c28f9832fcfa386212e5d4c32cafa58243e0cca31f29844f8fe57417075b9107994e";
+      sha512 = "987bc98b79d3259b1c36b8231d47c07e7c5619d5d9a3a794f28c213fd9a8540b9642f7745496dc4a4ffbb31c7e6615cd6f721c571a874eb3204840e2530aea17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "8b861015dd3f869e55a70001245a2acdd68a97932431dc48ef685882d5b1ed890ae6ef758f880c85de37661f770d3b776b71f8ec07c37c7ea60e3c615a9bf308";
+      sha512 = "99b909e532de6761f94adf995e9de48026af4300fb79f34d2744c677d8df6d363b2627ea64db6fb00765fb283157a0ee7cc2ed6939e35a0db0d72ef98b5beba2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "704952c178446c95cee66508d09d1f73409c1eef6fa333bf46996ca7f2ec8ebf33e2a0305e29f65f493defb43751ec4a7d563f85aa24c56f37368586ea8ede03";
+      sha512 = "61e6601a3bc092af06e4ca128f1fa0083cb0a7d62f1bced70a44bb3d526ee2cf440ea6663e072801c2358904e3232e310c9ae1d6610aa1021597ed26e9412a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "069477569c7e439ad4d3677a7e919a9cd63db35e3f081c6e5af295886983ce63e0b2407e017314bbf30478459da4faef28c3b6a4dae8e65262bedea032e21a15";
+      sha512 = "a57ff205a6050fa7dcfa3784a84e7c09f2b5e790d24dbf84001b5ed9b122a8904c02268a88389f7a8adc611c8b6ffb86fe07db99ff2993336668fcbb9fa366e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "70056d4370b16fc1990e5a3e65259efcc9c4b25fb9d4732904b622f4f331ea30a3d2e495f27e9e1647cb2f40c5914a2cdddb42fb9275bbb94ae66b69deb42534";
+      sha512 = "664687f45af86c5c50990775c0c98299eae4a2388e2034390af32419effaf21437f36e1b776795e3747f582d4f9f2979c1901c189ff1500123626cedac2ca5fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "6d86d3bee8bafa88652258cf46351b79d85f66b675ddc6196b251c2f65f9ff2438880fc1760a7d51a847a017c67cb9a2e9fb4c9d1be08dec212bbd8c8d46d7bf";
+      sha512 = "c7bf83d4167fda83cd6c8e3e8ee67d2ac83bac1cd66176f8fb4e5d6ca089fe74a01163cbd32907d54ffd31e9871392dfa864b49608a81753eebecc24dd15ee53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "fa97cd30fc4aca26a16969336473b01786b0989e5d946df8151d403761edb49e6c7a818a2522f9e30f5a233b0ed5cdd7c862fb7542d576d80a167bd05d1b9aa5";
+      sha512 = "635ff733faaf7f73e2cae9c82ca6c8a3544ee50963ea8a6d66a27c362ef0f9f33a7898b1aa71f4cc35dbea36c4822deaaddc62bf4dbfb3a196c82810cfc1971e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "bceaffb1db978ddfcbd167450d43a43252dd3301a41f964ed4ca7eae0dd4a8e44e7bc67d0ab5dd3a8d19be1f1e108d839631e3efd1c1c8342227fac3ddd8d588";
+      sha512 = "365f23c6bd1d925b86a7defcb1f79582cdb55b45cba3e57854bb20d0f9d81e64d80a8ba59f17c133b2786a8e6db64ea5ed66a7827ee5d7af2831274649108617";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "37f5ead0e532ae44db2b9c3cff2fbf9001d9aa7a9f3d7d49c50b0db5cb9c272888d883bc0fcdd81e80d5dcddbf32847317948c13a501539a2a802d93110401a6";
+      sha512 = "5b461a1914318e4c677ffb90ce1f1e7ebec0ee71844d752b79bdb9c96112566f434593d6109ad5ac718563993a3858e0f23ae8261aadc46914cc00d2021cdc60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "4a4579786c2727684c4e960465c3e5a478d1af52a829588900bdd6ff093b8cd58d9d5e9cc705f49be2dfbde50fc2576fa5cd197663bfa3f390f9a1697187b865";
+      sha512 = "163112f8f46bf50824cea46f9321c01f9f56e961cca8c75d9be1bf62cb1d02f70fc8ac0099b1c5ba4c78c921b99014f56a863ae86628bc45d550820b5cd610a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c9a0ebf132e2fedf887801d7e061c4a3b77f550936464ce4d232e7872781a9922bffa235bf4bc65679aa9a528d562df911be6bb817498cb1ffe3019e84f8bc33";
+      sha512 = "69824e25b1fc093107440b9bc01afb3f6e2928743c13c600175a899476594ee07b086b1a2d0c18cd045229494b191b77777291bf05d8718c6e555cb7c3c68e88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a52a84cd2b2b63400c0dc4e32ada00f4181efb899d35fd6e7a369de5a7699c5c46a6c892b0ee558db2f59519c169868a44772b948e04bdbfedbc31252aa5817a";
+      sha512 = "7998a6468aa4d2a023cf824b10ea49340a4bdaacc103cb028b5f86e2e0ee7c75caabd3e219ea31396f4618bd7e053b5138315e5813da88d7730cf50b95f22d25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9cbff1936b03c19c9cc8112f5aa380ec5d783702d8de98c9cead3bcc9576b9ea5f2e8381ee7b6dd57822727922e7af04680005a2d394470baf1ea13a036b0cb5";
+      sha512 = "4598605812207c90494836756ec3f40658518b4f137ea1f3428f77cd8b108bbf5b3c9a904268613cd4b5deb5d1841989b02fcfd4046b592b8b686e9b7853a6fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "c83baa1785779e8e5c89aa1f5b177b737bc1d785cfb3d08e967f2203ad4694a595cec039fe844f285d68cdbfd7de887668df106a2e9f9da7417bd4013bdb7d17";
+      sha512 = "be2c99b0b6300137a207be27e4874fb2996b76872fc2a7e0825925629c132a6e2941994279bf5d5e6f9ffabf9121385675cf2d1fb1e4e080e60774f020098e02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "99343fddbd4d46b3f123a0d9d99bff1bdcf13ebef37d649a54d5b0f25577990d0891971336c4e138d7a8f9d52bba25f128e375177e925407786cbbed297d1ab9";
+      sha512 = "8fbc33a87be306df37db45604e0c5bb4c489436b38d61a33d75cfa1d69779c3edcfb32809daa4515a0631b795d9fe6896aaa31bbd32b9c406a556487f27e8051";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "5ab9e0cc0f624e700f7e7eb656ddf3bd1cb863eee57ac7534bb66999a4ec09e17360f526648ecc6733d5e2b0879d6ef39de77d0c448b721c8101d38bee144515";
+      sha512 = "3b574f1c3667da198e9de638fbf07f595c1dd8eab7deced07f0163d18468c443e4e630e9bb3f53c906ec50805363ef8bd2c349fc58cf1e7b9a498341b7ab66ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c18f825cd703aca1e5364cbe6a2c377bb683ecfb5f69407933eb593c889fd5838f093158d8494c862d00fb6fb662f535dd9b265a7e687905ac52843f7d118083";
+      sha512 = "3dce20ed69a821bc734ee0c187ce76fce142caccc08f66f6031f99c8dac2da8b0f8f23a65eba3110fd3b596ac78adf2dd47974838757db7c73b27efd728ec556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "00aa5f6478e5b69b6a1bd65751eedd16aa4d0d6122f16ea40dd45a20ec40ea1efea4b8668a881258c3050be06639199ade24e02fccf17a34c815a75989117ec9";
+      sha512 = "0174ea6eca444ccd1c2de27585aae9e4ae7edeb569bcc3d3ce6b54c49b7a8b58eb235403f197c99855561b070b2b6afc4a66665bef36fc69537fe903a4a5940a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "fb116868e59b3f46d53407a4706d88120810d8f50d86552f9ee75273825027ab4fc454a58d179d33838a68d66bd1bc37b736237156217dbfe5165064649c5979";
+      sha512 = "170155e9c64f6261ba6f6d292ef1f503c8966b49630215e14c6c61a9033bdcfd6b595ecf638212811628631e36e3cc4664867a817c78aa2e0f38e63077be831c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "7d065d2ba0f6d9d00b092bf059212847b989490f00c1bb4dfe1599dab4ae219a229a250e7b2d357cf27358f6dad034e53dc94370adbc29ffc040eb6333592177";
+      sha512 = "9f69e7e09848e423cd4103e40e5aad4458d33e6d978c4b00fc867544908c436a6aeeb9d41948262dbd97ce3cf018a71cb6d5a3d32742e2c3bafcb52107784de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "3c9f591d4edcba7001ccfcde2393f581cc79f0cc3a05c098fbfb8a5023f9b20dca203d84241bc4aced261d482374411a06f66baf302881d52bb062c1b88ef0be";
+      sha512 = "3f22f9712e42fa10da04baab8960a03fd7f479ec6acae0cd37bad04b52fb919aeaca30e8a5a074c9763e1b48d69310f27ad8bb7d8168a836919b0313f9b864d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b922f2f45fb38940bef57054f307d0f5c37cc282841155f0ef09ed66722f80c04e64c1d7234cb1754e8afc6ee455f70067d25cf24c58cada9545234a95099075";
+      sha512 = "f6d1b176db8d1022f2189b24cbca3c47a70dbf44542db310549364da9f442513d77530842118e187b664ab3335bee20171d66551d30927c8ac02d45d4d361601";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "814f9fbf8e46f123cbe9999b1365226138a49b8f6d2fdc1dc23d472ea757c785f4458997e7a054121a0a72df6eb88782b0a449abfe3ea9e639af99d51325b238";
+      sha512 = "bf648187df56f207b720ae53c484e81046b8899e6047ac482ff5a8b937096a0991834a2416a1fd0560236079c25393f9d2171da15bdb7e6cc6bc320ea44e5b85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c41acc63d7dd60e50198084286da55a8d64e6544501aae1cb8b2aecbfb39e3ff9a630cb1f5cee164945a26d6bd42b302322c5533afad749dee76f5bab46f0b12";
+      sha512 = "9de51912d21abdb2e857a545d647c4f83da421796bccd6a8ac6095ca33a9dde1b0cff62f548f734fc7510590f8a29c0e2146ca2ab0745f8095a2f787cf1f6072";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a4b3ddb51502a21435eff747aba28f458a291c399f187f8eb8f008681014e0db9f09a813d5851e3e7bb7f4a5c882c5990c97ae40782f74a2aa28b4d2c1145dc4";
+      sha512 = "40c47f9bfd0a005f740d425e0a31e7676b2a6001bd0e27948e237bb1f0b087d808c1db836fa06ccf002b4c24e21ca7aa30dfa6dd07cf9a9995c746f73ace7a2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "06312f8b135122827c5a7f14242dfe2d8b2b8a80a4c6f707317ae57cf988b052016ba686c666de90bb6389e61b6194944f26d9d2886ef89f944bb31ad6a057b2";
+      sha512 = "9f5c7410480474c3053aec0c88fb0afe5528382b0e6d8a1a53d9e7a6ff3a0dadfbc3a52212f86686910da7d8c000254dbb30f320a93096bf973ca974e44d7882";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9f75c4260a6329fab8e18851fce460c8434d35c91c30c8aca0945d184bd65cf2407b46eb6354647a37935e4583e2327e9dff170f9b2b8b8925e1f317f4ff9637";
+      sha512 = "daef12bdd690a9dba14f71c5dfbb074eea26e842b526c2d48638872522a1da06d3c486aafd0713caadf1a41be6bca2609bb38282010b1de8db65002e5a427cdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "082492be40c27d720771422386948cca4c4704b8ac168b44e9cd3ec1c322ffb42050bf1a0c2be1698fd185cc10a9ed1acc665262b5280e131019a4aeeec69f6c";
+      sha512 = "d0be68142b8b640b829899da1103a82c7d05dd310f8aef55f38dfb83b8c080b366c4431a16fb912c2a890ac2b76f1c3812ab91444d8f00ca70b0a07b3bfff778";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "d7809ae69d01a6d259a72aad63daf03da539fd4aaf0e7dbe2bf863f2cc4f1040affad9ada368adfe1115e48568e32194d5bdd2645a9e53c124d370aec1f044ac";
+      sha512 = "2c813aa382885e2d06aea8e4bf10f0d2582c733285a82216a490ab8ec26fba17a15b9b0280ad33f7cc18e33226b77b6c7d255a3dc00a2fc4cb0764fb7075f6e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "bdb8681befb9600653dfa5365349c117115b2f62b0a35fa05e7858b077991296d5b0abf3fd6d9fb734eb556fa600a759a33cc171e938c05a6267a1b44dcb81fd";
+      sha512 = "1a325a8034278cae28602a77b64b2ca33d4dffeeb7408fff2e9097cbf04e11ee98c07ebb71bb963e039d4cd7436ee6dd2bc2134505cef573231509371ad5ff39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "4871f2109edfd3347f2524e22946828df8aebf36e09cab28922400163a9e8da2808d297c0f2961f3cf51f7659706f15e01ce14d91a11651d7d46607691d2b392";
+      sha512 = "a8eca8c9b7dc76f055d701bd564d17efcdcc82c1b2274231e7d0652ddcd97655dd2c8cca1fc49cc280a7e537d7e463e33483c093ddbbfeed2adf250f77d60d05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "75e18eada51ad229c6d9024f1e59f27fda7e3ce39c2a9d776d43e7b39f0490aa0b2e0f0072cb4d2102e21376d144e957a785d6917b49399470089a4c50b86fad";
+      sha512 = "071c9078dd840aa6baa97f6ce0e9f6706998d03ce544d7813755ce217d31a3aa436361156e19cf343824b6ab56275b0d0c15f49390af7f061238102dedc2b782";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "fdebc1ec11dd68f709bde3489e9f4048ca06ec098df86e059f049b3ac42c43fbd2385375d138481f94f74625d224044f8bb4ef9f8b99db7e3744ba5de40e2c2f";
+      sha512 = "c27c3f020b510cb05b9dcbd94209a759fa15107d6c81d0cd7f9b1935f01c61a760a1f6f0b29b133268598c20e85fbe27baf3e74f137619671300036500fc6da9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "31bdb35e58f603734f02814a6ca8bb7d25e4e441006b4e1fa50f31c289607f2a8b87cc50196dda4cd2110c254a0aff828fcbf01b64fa7ee855ffda478566bafe";
+      sha512 = "a136c0ae01187558c46848ea5b6d30442493189d8b380bcd60a12f17134d9259424cd5479e164efaaa840b43b355f4da2912d65c15500dbaa70195c5ee25674e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "665a95aa63f4484adbb5fab9175d9961b393cd4246503b127898ca7a75c014be6a942e2ebb5229e20309cb19c04ec1d28c908ec2fff763023469a4adf78241b2";
+      sha512 = "7e22f58ebe1b99c50fb84f216f1506dcd20d4a8d094b8b6787f26f9b44f86496eb68f8463694890a3cad3f491468bf1f2db6aa347446999ec67e598c4d608677";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "092a3b45b26d679dd709546816bd481330b6dfd69013dc5267a98bdf771eb2b97dcdf297ae7615735f96faa4ad72fc89417e3d5f6a09301d38683bd5db31c1c2";
+      sha512 = "18e138ffdea50531c30ca75377c3e241954e7ab7be5b4d81c4042a0c523215b570391c3ac75e7e860ee0b26016bdc201a76bc198526d7bd2c96637d633aa48dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "13a1d4e3931d4a0ba80f0cfbd6aed3974dc9ec6ace6477c32b1de0fb59076619d14105a3aa1f110fb52274dd2f29674e2bce2040eaeaa5e0caaff11b52de4ec3";
+      sha512 = "7da8c3c9c1f13cf635b1d70836b507983fcde4a50a54fb6781e3f50f4cfda2d38b10bfacf27e74ff501643c9eb93722ba88ef08c938bddb85848b2821727c378";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "b37f0902e8b5e05a5e3d2690d64b7abee5293f260de6410d1721388d89cb60354114f18849d5be5957fb1b6db4221da23c35e2959fdb8392be6e2fa3effc2667";
+      sha512 = "47e0b6176db5b5c97051316ddb1d67694534aa3d4d2a84ae68581e23667ac1fd4774c7010fe63961ca8780c7f799ddfd2bd959a83ef57894737336cf6f7bde98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "bac38857fcaeecdecd3abbd837ae1b729f6bce1040985f38243402bcc1aad1e69e59f9c3a2237636174d9b2e1a080ee16364912392af5facf93f901aeab6b947";
+      sha512 = "501990e922eebcd108ceddd5779d55852e5d6dae0fa4525a86066096d44ac84e6e09886a8a099968c541a5916a14e59a4c683b9faddf28606606c10af38120ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "904edf40c00228017ab4defb97095b0636e0153043d74c33c9769bc7c134b5d8f5865fb0bb1081a69898e5bc0b52e5f9c0a8ff350e7fb9e7c2ac5c2d0148656c";
+      sha512 = "7b22e657f393d34e9612c680b7ae3aadb85e03575e2839fbd75c06aa4577fc57ad4891ff080205ec2da4d303fedac7fdb67774f06c91442a629e5ef863edc58b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f79a1d18b0f2eb1e0e5f40f02fc582422f1c07ce13661976487e2b40621b190ad7d4d62ce3b2509553a5997d284ba4975ad681118589a7a6d9c170955c0efe83";
+      sha512 = "e77995d8427a651f405389662503a6bdb6ee93247f96ee925e214d35859da88f5fa355a9a247d5d8a2536f3b0d962a2ef103f03e8b97423548136c4de2095136";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5357a906a9f4920f25db77efb655ebbf54fba7acb1120e28cb0b22b4d825ce53e458fac1a7d5b3fd21df4a735d8d96f7d4ba9a878f0c54aec076c5ac58e592ed";
+      sha512 = "bf562ee1a588b6bb97282aaab54d6f60d130e1012db226a805f4cf54a8b2bc6d0dbf37610faadacfffbdff0d50714e83413a5433336e0425fc70c39802b92535";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "8bf5e145607a5ff3c84df57d6dc427a87973713d246677d2280f0452c7339c6008bcc49f0f9e70ff261b9cb44dacb8d3a442ef9ede46c728fb7f21a5bf0f95a7";
+      sha512 = "8beb3d7c5e5466da9a182e75bacf0ff0d512cb7b6d2b109721e595e289b292e11a71471abe8591f5f5167bd8113e7e64d5f4ff1c0827f56de82f01d67e9068f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "16b5a217eb6179300ca709d97ff504339bcc0ed6684d68e118672974eadf58f1b5d28598c29f94aac2a1391d592e543cc42258672fef14c97197b2f4684b410d";
+      sha512 = "197fdf8238d86fb62c9f5f70a2683c978c3eabb4aeb0a2f06db6c62f2e062158b28062bcca8d5ec871e3bda6a8ea05039a2281734108a898358bb9239a69b34e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "5dceb3a11da2f02749341c9064c4bfa798f9ab1deb02f6eaaac4ade66acd73f1467deb491583e6eb74441ff56ecc15531ba3f241d0009d9bb42fb7e0dbc44d5c";
+      sha512 = "bbc0b871e9ad5a9af2474062bda1eea5b45a5cd715167eb33cca748c27d9c5ad2c3a56df2e4091f691a24b6863447dd0c8e8d2dc808dd7f90a811edc164cf7e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "388fdda87262647ff1969bd5dafd0804304d4bdb1255323d84ddb4b4d8b423224701b417b0392f90ea13b90b8f8ab7db18fd3d015daadf5480fe0c8b2965813b";
+      sha512 = "fe7c5fcc41d40a0c890dc6b59411a757c3bb849c81c1c4113c053028c42612a5575277400f1e1d93dbf2be748b1ebd0c5063deae8edc76bb5f7234e3d46fe949";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "8c84473bd83e31fea9569c374d94b95f8826be2c456d7848cb813bfcd76cdfcf5dc91ef6b406368f4170b932d5575fa79d126e4912fb2174a375c19922eb7191";
+      sha512 = "7d34ae2573d004f8f140607e9991c55fff98babaf6aec74fac6f3bd3f34aa2ca41c82354c5a935429dc3b7e95f2c1472b3715b2d5931b30ebc4fb01e37f18f27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "10c03fadde9bfae654f349e87e791d1f71b6411fdbee46073a7883bb5e31f4eb34467838356b3c87c4f0a1db1bed0aa8a9de44ba25a7f7b25e69dc1516f51db7";
+      sha512 = "8e281cee72a2066af4c1237f919fa523893957180f0bf21ffb5e0fc10531487a08e179181e62fae7d273269c0ed936a6e2f206bbf4e06cda80507de76d4282fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c3d13be822bca5d45a584c50c9c31ce1050e9749eec9de273f77abbc9fdb9867e111e4731a8c22d55ea9cb7d07d608b6f19a4b38dfc7a4d9b1ed32baf751da64";
+      sha512 = "dbb1bdf377df73f72b5e329fab94f3c10a8108e5f60b74c025c6373c593a37b7946e20b035111fa25b69e424d8a9adb6ceaf07d0d5a0163c89a5c3016ba09ac0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "ca7654c7e16da7233d74ca4a7850cddc57e74110be95ae1d3b97c51f89c34099a229a47ef519704846d6e172be615a87555716073a3ee4cee55d0785901e65f0";
+      sha512 = "de0a93df81ef58eb79dc61f2ac641f7ef06c0dbb1ab273b0b244312731bb4ce80907bbcfb10f59fa1cdb94f712499ac708baa224beab7a11ad8313bee8291e44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "623419b86e05f07b8c93d0238e308039235ebe0818afd352966850d39579fd4bad12f70406208fe7e69f72b67105f577953b921560877d33c3cb7289e3b7ee3c";
+      sha512 = "274ad7363cc5c03672c3a0e4f50382ff1229018f316143e50871bd0a0ffee5d02996981dc376520f558f42cd0696ac334654f10e579cd1139cfdde12014bf3c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "de6fefca0a95d228850b950fe20c5c5075f6d74ddbcd262a402fdb1057b4882c40d48f78d8f6260999e23d70fecd360d71b799ab6a486b28ac5f6d383bce0a02";
+      sha512 = "b6febe826fabd153bdb5d66c0cc6f65eadd69d5b0137467861c24f5d9b87a1abe24f1a1d58ad2480d4cb151cf61731faff5d8cf47ef69c02ffd8b8d57b3bfdc0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2bd609749a8b22c3ee48919dbf69e9940ffd0eaf9eb9dd5e1d3be6c8908ac36ef6a30b5d7173b5f6572c69bfbb899bf92ca7e69c8038645a38e2c601f86a6fe9";
+      sha512 = "69fb65b14ce8a63452172e970aaceb41a7559061efdd7379154962198541366dc55190dbae81080d74eb5b2236cc74c77c15bae3cedb12a0437558e10b730ca1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "abad5a9264de2a1120ec53d6d44776a4072ec9f62caa565a6ebaff4791c10b790d2478e989318ba5ce18bb701e733bc413f902a78bc6d4cbfe565da36e255d71";
+      sha512 = "25d5725cab0dad6d67f08fc9ab694045672d5ac497823fec237dd68d1e626639558222e6293177df503c19e9c297ed22273dda60283e80985c2ef9ccffd16360";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "1c4a99ff6218baa53fee4e260fc9a917a8be5e6abd5beaf960fe7a0e17c19f22268cc62acd106b2ff87772fe4f200c1eb9fbcefa9d84c5ea36066408f8c74a2a";
+      sha512 = "ba95efcda55fd6c6cf5358bbb24bd61d4f57f2103a38eae3289be00bcd36ba0d451cd9e4bdf00dfadb86abf9376ec202d53be017ae47c97e29ae05b11e4b9c22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "47bb945dbbd1b23721e86fd8f250d6bd05aaa7833c29d1d891b6e8a5555dce59c3adf2f4427c871275c085cc1d0b433ddf1e0dae8b4644136a96fbf01b2c884b";
+      sha512 = "ef08a290c0b6555c5f80ac162f1233588e579cb32cc09c9a6f86c90c62814a67db37bc496a52f6490ea6de2addf6601fb225ad98ffc99180d16f1587735e1e0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "40ee4e0b9dd1ad96cc1bc315453b2597c3a32230a7c009dae359562a844bfc6fc29d76bc779272b45bbedf7f51ac55b1940c34135113410151679ff6908eb174";
+      sha512 = "337f8a7fa73712c03e4bd78a86f0acd5e8fe50c31cfab0549db1037606a538ee0881c8036d1709e554dab14643f89ecf83fcf86fbac5ba2bbb60c73c06a66508";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "9bd74d2fd76c9396e61eef04a5815c1c48c736700120c808090b28cd4b93eab6232c7ca67d40a685ab7d7878d4a894c8ef5edff1624a57d9fda1f1689ef8aa0b";
+      sha512 = "d45c5eb136282a0be9a96081804d25f717dfd210c57f64aa84ce5a445fbac3b75e271ff41d865f7e3ca3356e6586062259e097b1e4dcfe7e6e7566ec592b905f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "1250b38cc368996ff198adc3d4887628e8daca7f982e0c730d5f563757fe0744afb8c9fc35567cbaa97fc0d8eae51918ac2656e5b68a1c11bfaa41383ba85cd6";
+      sha512 = "092def4266f697f4bd01765aa14d2a260fefa8cb7083771133d48238bd4e5ab13a901fe2d175f6c38814d74ee5236452fa7e49fb7d203501bddc210c3af7ba0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "3972912f74a387d8d5efc8c7f0158077259f12005a9634f98e604a37407c96517f7b652e3b319386723126122e32996fa6387fd2e8ae9454412590353ddbdc39";
+      sha512 = "9b459458fb94ca2946fa5e461c3d2770b00a45cc11a17cbc7d01799871e4478e94fb55605eea23d42cfd0494defb929f0ef6faf043f53e227cf140fd1ba0e0b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0990fcab28416bc0c4616ee1ecb33d38e6d9693b09a2aa3b546e1e9115a229a4ef94485cdabb8361619d944a02b1f516d7d229e984ec2cf4f68e2d85a71f83b8";
+      sha512 = "75a257e23b377f096d4d2f6900e1a0ee3aeb3952b513fbc39d5ef771337c8639f4f076c98af6b7719b396684a876f5407c13a6b9c17af4ede7c7919dcc3541db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "fba549690c99c67ab6c1d7c1e69c466fa9c91ae0133e052cd81846b18931aabd7d773817ecc6445c0819e71eb817c29b66d0061be60fd1caa30fb81f08473bfb";
+      sha512 = "a3898ff8293e78ae37eb017c16d7b2b01a2b5108ed674303505cdcd088d13ccd5891435bc128624317a7cf4b917072cef9b56cdec75111f2d7027bf42fdcff26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "305f09e1cf68acccfc3eab5dd147acc07b186d66d34b7f4642c4ba4b63e5c5d523c55f8f92460b1db076e9105cf287517f39460e3a336bd28c819cc1ddf4c376";
+      sha512 = "28afc83cc294430582ba0e7400c72f0596c15a9a8691a8c068dc2473fc86528beabbdef64ed56098e510474675e61d7b6d4616422a9f67f6e7e930c11e550247";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3bea23377782c0ab887c8fd5406ab4f8201aa302b37f0621ba3383068da1395353c483ab59c779171d57049f6d0b82dc900298f93afceab232c74d894a3de91a";
+      sha512 = "3e25f27060906e4ca1c06627019a45ffa09384fcc3b3f20450138e9984cf9d29d410e67083566b58b3e99a15b8b7a05bd0716cb797bd3958f1b0105066030590";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "66ab08448681715644f1fd98796a96bd8fa9107ddb66454efb281ff81e2adf14d7aa4d3a78735dc8a88a73be3278b44fa4f7cd07eacd396e3c3a0ca663c4876a";
+      sha512 = "45db81de89d4b8f6eed856b6ea00531de1879a1c61425482e7eef65fb5eeb5614e894078d8216d98f097e1c3356c6ae62d12e4c9c4a17d2ae0cd026c0a13898f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f162b28ff504ae53accdf80099e07c67fd5d8c4cbe4d28bf3d3a5312a29f0cbec018b4d1ceb058f7934c587b0d1d3956123dba97e5548a90eec073b2a46c682f";
+      sha512 = "4aa9ecbc712372716a98460523e463e6144f88cc5ebca2d2e102ba1c78107dc9b287471a383ea7c55b4b0d1930501ec69202656346c7279e5c15ea32e3ebb5a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "954e118d203ed335b43e22c4743021cd69856695af2900576e461c5a4fb82db6d2410db28b5f978c0f50c5bf443b1f499348c502540a6f718b9cae80b691ef3c";
+      sha512 = "e7c69de522160378f75ae339b62dfee2c8391247cd83b5b2b43974e7659dba131c954812e4ea55608f01f4f024ea8f8bb37d2bce95ddefb8e50ed73b006acc0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "dabf1adddd6687b36db7be633f3944449af48b9e7d74bf91a963062058fa59fe5abc235f7d0c597b335141e9ae92ead05a486847f1d2a21a6ada38ce3938b93f";
+      sha512 = "184c608d477ec5f2fbfc547aac6e5863208d92b1de0cc362efd68b5ae0d414141a904c9ed7efa53f0946d934a737d3ad897b6b92fe469c2aaa58aa7252ad2c5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "54ac6533026a330ab7926115803af0b511fd85b4a56078bc152c6df88c0496dedf6cc59f7f4f180465e5716d06838b7560c9aa6a9e9a8e9de101c75fc8d2bda8";
+      sha512 = "d11215275176c80bc479bad71e88a42d2fab7af2b92803a1c34fb80216e0d07fbb0af8350918d6192640a42186725d42b64f95e85c8822e5e0f9b208653c3647";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ae0edb7e314404566ac706ba527c8481688555008026ba54f4acfd4c8c0e1b31aa84314820c137d412e75df9263143858a4e87e38e285db0eda7227850044762";
+      sha512 = "bc3b79d190a239827f52ee2bc2d5baa58da3e6827878529571e1758bace4bb2d87b59319b1760c3df2921ae620dd9566e47429f63a9c213dfe0bb2f277703335";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "94695103f392e42dc21864ffb763cf5a29b5c279c043a867c7eb5f67640fa454b22118ee7928cd68299f14f58dffad093e67dda23f398c76971af24eae81c0dd";
+      sha512 = "d009b86e540746257d691125407bdc2a16e9770da25079376591e113a7be128411ccb309ce5dd3dfc11a4e5136fba9c98452b2fe1c7642a76c17145b0b65f0a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a224ca31468ea32720a1bcab6b48479b5f1e75a475305fa922e3085e7636106011406b144904348ccbdbddced590210ea9e4a1f1aa5d1b42befd2a83fbaf68a0";
+      sha512 = "490362f86b3ef01b9cb28aad1ef57f32e4f843a7d5d9c5cc57d803c3571abdfb348082cbc9b5615a1b47f2192ee2041ba62ec28babf96c1541ef633fe1bb794d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "31aec72f23a034acdf81bf7afdcbdd564bc0f8835191d6e95badd9c8f726106b6351169fea5b5f8fea1008b0786ec26aa693473eebae85f4c36f43197ae8f57a";
+      sha512 = "8b8d36783808a0a1edb8fd27d163eea9605a88f1949dbae9ca9161b172ca5fcb11a4d127a8e1e321bd4c5879aee5576ed1b2ace46ee47d528eadda56022a1fba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "69cf522ea9acfbe7ee28cb5dfa3e137f1b6b9192935e14b909131dbdcbadaef36c77d2660a5216361a63ebea1608fcb8aef0dc53e0a6ecda35e7946a7fc81371";
+      sha512 = "0e57b4f8760e1747e71c550df26da448ea2db0ded608ef1ef1ae80ed9d5d03b26bf4c221f078aa04481445841bb90032ddad48d03f36910653c1b3c64978c18e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "337e70740147bc29e13e7c14d9e3705ca6477aa8791dff9f1752346514970e07ad134bc97571ef02659366e8d53657da688c3b5ad7dc808fca64382a5fce2a02";
+      sha512 = "3300e0a5f742001006d7e30ee6ac50a9a2fa4554248ff2b29349ddd993d1c7a85852b6dc311b0869edfdff564f5442ee1ceed033452933c36fadb155407e981b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e105100b11ac7f7271f2bf4d4adeb2a63dbd3c908ffbabdec2776fe15f2bd8c021142e2b20e9331481b9448fdae1fa7cac613194918671383ee7791d7a081d70";
+      sha512 = "da396f23f2ab91c05d85fa0099133a95edb4e05700b0e08d5ba240a38d4efc20ef6769fa3a0ff5de2622d1dcdb381a264db6cdc90dc3434672223220f6e45ce8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "84309476b384672ba4f9ba8cbef78584eaf1c73de33627d02fb8e125da57391778927a57ef7b9839b52037bff4a9565c7a64e899b3a9fd0f6dd1ca422f82f659";
+      sha512 = "2e68d37451290d73e04d6a5bfd192b399cad78844ae667228aa18b77c08da3ec7cf785fbafd5ea490a3bacefdd97df81a55c9e944d8cba6d5f3a67a257d319cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "1ebd529177ccaf448609a9ea09e5aafdc39059c913c5c7b7e75d0967d1256121ce3427d9a9839cd4d086cd41b54560786186bd31cf3c00441d75c21c4dda50e6";
+      sha512 = "ded10aaa1d983d636f7182622a29c1837f51ab27146660139858608ffc9caf0c6f5b836434b1cb1d6d837188cb717d75b1bc69d73c77859fac9c705193939e06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a9d9988afb346a133962def1414970c9793d81ff21731a985ff7a333e3869e5bdc59f1d6d8010cf11d636d3bc743dff7487f9aa8a5c3a400548d0759066bf067";
+      sha512 = "e4e5ef06ce826d5318aa4ff3b7c89ad88b68785e14eefd4bdbea01c38c5fc1eb43286cf33225b344a6c665ac8ae264b4155fae8d3e14123704575da4b7382219";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "8ab01621c7533dca95e062c4f5fdb6d87a1db26db17f54a451d639c04816eb3bed2801355b9a168332dd6ddf6f452ae0aaf6db84f87837e8b6f0ad78130fb59a";
+      sha512 = "f142fbdeca019d1d5d012d9046514cadee3e81eb444c5d44d8ec83a9909ffb4837b0f219ea1190d06d5794e38e15121b33e7ce832a58b564d2703b7776cddd9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "02d600eb55011b2351e90d3a2be289ba1ce6667b4fe0fb63a5dde03fbbadf85ea13d791b67161bcb0b604869e9dd2f1903c17337fb52b4ed32c3dfeb23bcca66";
+      sha512 = "b0e41b3b2282b60821db2015979ba228dc32118c001473f6758633ec27acb817f097a985fcf782c81c7035a8d29c77eeaff2b217183979163fbb1bd83b6fedfe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4feebf408b21e1258be3b4dc56830949d4652470b9c148dd675b250eb2ff756a06937b28ce88f143406813d8750f0504bad001e9289e86c3d4e274b5cca6a87";
+      sha512 = "176b7033a988ffdeff54fc738b60505af089a6e43a38434b66e0405894b7b6cfd019cb98807aa24e168273978142a31bb5b744ee6e88cbbdbeefa715baa28f36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "58ecbb11eecc19bd748b69b8979bf1f1d029c16eeeb2f4945a75d968d18093940b09614e2d6e969129a3e405285f971856e7c74f33f2915431616e43507b568f";
+      sha512 = "d1d01695f820f9779c9741cf7fc5d8685bffb6e0d0439d37408f946229d78aa3852adcb5f24f8382300f232c157ab2bd44dcf99affed9295aa7e271aa135ed09";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8cd3239bf1baaed9d222c70402121e866d98cddc66d5763d1ab8e533093828721c81bac9ec74bc62ae7062b4c176c1bb530886b506444ce1b2b2e69c503a6f77";
+      sha512 = "640efe3fe993feeb58be649bda72186279108c08a68ea1c0258186ae48cd8397a8edb5cc3678360168e17f2c78c8c3e7f45edca0a28f43ae572bca817efb3ec4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "25e495437e74fa9c2d55ed775cc7398acfc6eb8206847caabe8d1b99aa99fd9586bba1de6eb2c75119b8cc64b8f7f05ae816ff06f373b9552b7e9407d6eb17d8";
+      sha512 = "993563f872020e49c5c12ecd03322d54f449f5161506d0669d80338133b1a2f5a12ebf6938dc9aeb89dae3dc589cfc3a80a9da90f40932b9fb02698827e4c426";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ac250fdfb15622b4f1001e8542591d43651c2123144286ced4b8323d18d320bad8d07fe3b5b1fbba245419e6f9a3e2c98d13499f61f3c8d1aabe6d4f3d51bf96";
+      sha512 = "02c617c9603a19d27acab55a5e9bb742d30bfca3db737897d50e9d8a8685487b0600db1dce1769a680fe3dce64dca107a31b904222a534e02df8cf51df92b31b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "47a59793dc03b6946d9d8410d86a593fb9c43e27e2843ca8268b503ee7043b4adcb613b11289c4727f4441e2502e5fd1bb1cd7d78fad51b343527db83220435e";
+      sha512 = "e096f0b92e79caa3f38bc805e838f18ae43880235bd409bdc53e545bf73ba27731fe1bb1e0baf1ad98c6f726f29e253368c47e69925145db388170bba6deab26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "cf3148447d9a69457b2314f670a24c2f4bb433ebe043bad2d6333f308567871ea4b43d6658d71f4f889d69146d0b87f2898272e7e37b5ffee6e77aba42360ef7";
+      sha512 = "f29ad64c1eac9314c06a8873fac9425eb0a038e5dd2570f4d1a24d8ef071201f5cdd0ef6280eb3ac790f8c5c55bac3fc177ef8004b979909f4c7949e42d82846";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "ac71ca325f78a04cd797a32e4ce02a511a9d86d39ecd3d730f990da201addad0a7d2d846e1467fe24f88a13f055194793fb1b79c929f902f87a8dad14a8c2ea1";
+      sha512 = "6dea9ee48c0d4ece3d9e1054f873acb78cd87150a3e21eed3cab89d2ee8cee58fe752167a2fc4ebedd630a345fc59a2d735d1c451c7b0537f5a8d5a7cf4faf30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "919f469824c477539cb9bbfbd9a6b49282f22a05e2f5fa5b14f7d175005efbe819bb89b5219c70494d430f27450be8dbef682e7cd7aadb2ed08d0ab12a8ee8c5";
+      sha512 = "699106f53dafd9d8b9c8c72e7c2c58418e83333b40a884d12506db2703b159fcecfa3adbd65ae27d4f71ba0ad608ab1da134ae59f2ed6d3091e01ef01a64f7b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "d6d945117c4dca2b547f499e53dc8155e35497ff3cbbf4829a7148be6e6f473d679427d2d3e316d793d81f842cab5a0c4c65980a1f0182b0064808969c6468c3";
+      sha512 = "34b9a99f25124039e2702efdb22e067e9484c1c9a01256a78293d11147796a4caabaa0f14b8002d1fc5169bf08fbd02a0c0ccd8ab42c9dcd30247e1e016d3be9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "cf45f9fa15f9082265f87e41a082ec83d6f6095112778aaa7843d3904417f0beb57cf8c05f3d7dd8d9ed72a25a9e7b029136a018098f6f87c157c125789e4e04";
+      sha512 = "eca27fe26595efa9610eb7ece6665c610f720177fdac8b4fe5ff55805995b9d0b48f0b43c71ea9a546da88959020e4e3dfc035515b0c63a19cfe1ed980406fa4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c994dc12c7a2535ac941a6b5a7cf5ff6e4fd59be0c97abcaf68af0f978a50e5193f5bd66c16c0e720863796bc000aecb005b1537d370eefbf9c063ffdc17a211";
+      sha512 = "da1471d3f979ece98eaf437bdb1bf153c1d05266b41b8a54aed3a78a30647eb476b154a87d0f0969231ca11747a00468c3d5759de24442eb1c2e3d49a85916ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a594ed7d8122ea1b55679a830d41308a60cbf3bc5073a9884907027a49d1dcaf7310d72b2ad3f2b727d4c15e72955d6de87f5909193e6c65874eff6fe1ed57f5";
+      sha512 = "e16025fa517bd2a670c8a7f3bf2d5f05e8efece75ea8ffedf88f5e0e728d18b6c4041c399da501d2cb0824a64e30503ab71a3fea068d30037fba47d494ed0ad5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "0e14c2efcbc025e109933766a42d79c048e4bcb2c37dbae2093d710cf4f3c277ad7d9c33239a38033affe1b45481e986f1677c168c7db47b9cc0bb0eb560f6c6";
+      sha512 = "b7029f56f0f7d6d70ebbefbc1f406c75fb1f0617eaeba8864012738921b18675c752ad2863f177d26a5949a718ebf82699ff4bfbeac8fbc267578cdabb8369b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7b917ab09b1d8e02045c877de859330b3fa284f00b7888ecde7aad2897edbf00d130a0ce86ed52faf78f8c78bab791a005f9aa26d7de5b9bc18a510566d8a092";
+      sha512 = "4f2972f199cde9802742cc7275c7e9df1848f04de4e5500db5c09522948b4a3ad027614783939d71d7b6d5c003af2ddf4411d391e8d391282a2cfde48790db82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "4fcdace94e6881ebcbca35ab8505caee6faf3248eec47f48652af51738ea4148f3ba5aa5c6ad06922f41b42314a847fe390cc8ca0fd8208825fc6e40b201b29b";
+      sha512 = "10d54de8b66459b1085d0cb04c4448086dce730b8af1c8a31d340c15662f206d1fcdb1ad09bf6744515cab6fb8db69185a2cca9f3fdd438fd57b249b76e9a7fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "2371b589d46e4104219bd2514abe89b58c07edb6a1324be872d127ecdf3b03f711672620e12e751bb0d80d79f5073ea0783a4757281fd650da323584a06b496b";
+      sha512 = "ec98734be92fcba4764d61a0674577ac388f8252ec62a8631cf66ab4eb88e8a1af2ee3157e0cafbf97c59a48d90443f0a8781183999da713dea2a7d67f816ee4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1c735d81f757948058a6433de854483552f8ab8bf863aa363cb89573a7d507048287f79279ea05ec805778cc70f39738f1bf3949a4491370ed41eddd95fd89e8";
+      sha512 = "0a9c899263a068262d8f4d0f666c43f8b06bc6dd9377be27b88ed1920af42eba98df4b491de5d980f54f43193ec6ab13b8cc91df95d6eecbf755930f49b1f4b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "94a52b48326b8c6708366e0a4d4b62428faec108d9897cbef60190608fd1a32bfc10e1180f5a4544815737b7f02c9f54327d7062e94466c51c7ac50121bd9cb0";
+      sha512 = "bc23a2b13d8cef1b92c73e2fd647a670db5933a4e93a53d2bb7a5814d6fd420a5cc41984b6adcb9863e1f9dbc451c9442e0663f096a707f947f0420bdd6924fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "8e82dcfbbcd398200b3103efd62aee511d6594805034c049205a59dfc7042e18bb6a86a7f633a2c5d1717721f22a5a20fc00f31223b2ecaa2b316c5908c3a489";
+      sha512 = "e154036b3b4f42de8d880be470caee5fca4a393c469189fa59c9bfece9b9a2b1fe9f32a65c77c47f8260d5ce0ccb81e1bd0f43ddf98bbc608e76db446fd1be40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7cf134789f157fb07254028227353dbafacc6f82bd361f263233b767c3d5a2d82a0c128dae6a2e186df3757088136502240c1254974a05bb7e7d9171fa5fec06";
+      sha512 = "3483257b21b58172c086c291d77a3c651e07d62b0823832d5d8e1f48fcb9d0d3a7c35df29e11e346380e78d6463802765ab1009ed4e64d7e0f4db1e4beaa6419";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "727b3ae49955f3652a4315f24f5b614b27eff8ee9e9ac2c879f5457f727ae4d8b4d6f829cdc095ccd7d5781e3afb2ab4bda9657e4069d4d7333a4ca6a6c4178d";
+      sha512 = "de877d65e07d38d7b30bdbd3be409797b22cd29b3ed49138257ae008ee022655a3082a82f469ae99a2e8bbb3d4787c35377aa383f43da9d3cbc978a6d73c9bf4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "52b49be17fc6054405e62aca76251f7b4d8d343e4320886777f6ab5dbf3fc212811742a0d2c8b6ff537cedee1451330cf97582b0de9f5e3380f7800fbbca50b4";
+      sha512 = "37c29b7e014b20c93733adf75bdd4a427d89d8d0589e26bff48a94c4bbfdf3867dad8e6df0803afc08206c62f6a6952d46332e62258cfd2956416b4be29a3a5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "cb61acdef2b5dcab12a9feb7c1c5fc95e42b94d0806ad551e3d6965082d1faa8e47517447d872ae068860e36f14dee1f2d611fcd1be3ab70b81b43ff60f9daa0";
+      sha512 = "5931414b6ee32a5b8e2d3730067b16b924ef93a40e93170592ec66452311dd9d50a79a73f26c143e3ab9ed06ecf8b341fd035445ec95199340dc64a10d9df3d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "8b8cbd3ba57812a57e9b5ac2427132aa832f4c6a132b4d5fb9312f53a7312bf83fc3d07034527b8364f6270d92161d2c855a4e97750c579c2ecf5e284d1830af";
+      sha512 = "80bcf83c93319688123fc4256eb1346bca6d307ae9c87d0427eabecb006897d73c1fea677e33d1b9b4e888427116c2f1a8df60c47465becfe4a947e081b8d5ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f56d01974a7f4377f59fa4d79d13735f3fd402fd54e2371cb375d081137ee461b1fadb37e87572e3d3e8f578eb39f3633849506fbd896b1528f71d9083cadb7a";
+      sha512 = "05c03cec4ecbf529244f19823cd00e0829e830e4c23faccd750fb1f239ea155b74670d315b8f1d94ed692c62f0c41fc30a6c051ab0410f84f408cf399dbc2225";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "0c9fdaf9319b7f0e9e8a6f98f98389c1ad43bbf60f671901410d9b73a58d31be6d538cb70319b08c317aaa282ba6e27fd953806913fdd777dea53c35709cfd4c";
+      sha512 = "92655f6a715fdc11cfb65f78bdf330e7f1bedb445db81069ba14a6baa1bd8494042ea837fa3e4f8f738d9758e3e7b9fa54122e7aa063ddb629020646fe4a8dbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "5b7d723b6a3bf484b63253652068963d3e2ceba4ce938a9e15ee8575516121dbc548e05e0067e4fb01b0226d018ee6c13b80f9ddc92924e107cc2399f30bf23e";
+      sha512 = "b87544de15a28f2fe7ad4c9b9f41b4bc1ecb679ede72b28d6dee37717f7c72343949691bad30ef3259680d21c8bc302e5a63f346e1714a8b3f7dac07051a3afc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "0266f52a3f0e5afc0aca01fea7b043ebdaf7c8d2036c417b6fc43ca44dda5e42356100e15d91e8c96f55fefd791d30a9791957037da9c5922d020f5941d1deb4";
+      sha512 = "003c07ea6f748a2c98a8f4846484be4f49bd4e0541467c766eb00728c79a9e72441b8b426b20f1a6c84fa66c5c7d5b6d4903b92b5cf15236567610f6d9249816";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d3d159603f644fce578b3595e4f536bcdd673cf9f7ed51ac2a3261a9896c977ea9ffbff3c514d388cfa5ed55f308558f7532c64615c014f307cc1ed417af3aa1";
+      sha512 = "177bc5d4653f8c2f555a7d8f8998a7433b607ff6e90d65f107ab2b40ee5349f96302ce63dd352c14e23f399d6a815fc0da6e52260d8d196daf4752ad8ad0e183";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6a5275434a8d4a7c2ccd950a90dea8c01256dd06050fbb89f46e3b3b2af93eca58cc63ba0a3d2ce74638ca665c03e50f531a38c2e7ddc656ff8b790fc91b86ca";
+      sha512 = "ed449aeeb3708c335b62aaf5ce19c6f0e510505dec97c10642d5a1eb9b9befa6afe8fe14ea8e8027d0588643ff37b8a08694748fa7486b47a8aa20d841f41996";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "dde0b49642051ee119fc494ddcb8f460b4f2266bddb0b6bcbc9471024422b0e752e5931d463379b2bd093e263841770ed72b2a0f5ac6289738824582c9b5b26e";
+      sha512 = "caef9f0f146be66981c92dbfcee6c3198c361183940fcf8a82dbf69572e0b53209ae9823bae5d4727ca63f5f28dea0fef15c810d1b5a054b12f912f83d23aad0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "d28cc78cbace72125d82987477c2d9d2842588639a42ee5fad8ce32c27dc7b1c0d0fa11dbd780e2084033ec92337e02b16e1b8bf7a4cc07751fb431505576f0e";
+      sha512 = "2baea66a7b8a9f43b3160130c59ec8e0b5d80832b4a79147185b6f632dafa53b9206c1824fcd2fa167efd4d9e24929ed56bcdaf75e453ccf5e2e24d638e37253";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "0fd3caf8fdb6131c925c4bd5dee53303eab3cd0974568291b2fcce7d3cf45ef303ecced2e1c35c36f4929a0ccaadb90c4f15eed7beac7cb557fa19d89c2ec589";
+      sha512 = "a2ab5f55bc7494b546f28e6d322d180b30ee0ac4af6151b9b1ec6bf228be0ce569177bd503e0893bf065b120d697e1682de5d36e3f47967abf03e2d6d1f80899";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "a532995d36104848afa55015ad2ace55bf75b08866d15a1d421e86dc9fe63db1e81ee394336266e466e4ccec91b152a52eaedda190acffde6c081d31d0034dd6";
+      sha512 = "a4d4fd7470dc71f17fa4c7e4b9f4342bf44ca318ece327ad4e8e45bbb4a972d5401da5313e1b60b7f7c847a1115239f62f962afcc1f509faa1df90f44f2118da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "42b91ea7daaa5c95ba73f84b9bb2bc5f7a2822c265a6efc0c00c9d0c2627d066ed1a59ba0124cd7c23823997b5aebfcc79477d77fa7fc537fca96f7a949b678d";
+      sha512 = "db130fa050eed1c2e413c93ee928f5f3d9acf0f749cc29eb54b3dc2c676bc1a138fc14da9ffd7d261fadbfe3f9611229c3f7a7421c69feda7811258c93ae96b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "56d98625777f708034abb9da0d2478b84742ad4a6275a0f4a410d35c431eb50f12364c6c822d5e315b8dfc4eddf7e2d36d5fdc42775ae1e49cc2b0165af027bf";
+      sha512 = "b20d5c5cbab48dfc924c1415ee25c3b4c5be6070797352bd205529786ae0b2b08b68aaa1d8314f7cc93ff29e865407e48f078f9a5010405b52c2280681d06fe1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "17d385688a810c6850ab2842777ed5af6848818d78226fd931a26394f2b423c04984c38822aa0b9172fdde39c14155e6cc35ba6afc3f7b1ecca37bd17aa3e088";
+      sha512 = "7b48ac5dd887a7dc0c69025853e9af79776a92fdbbe8e357b996e2869827f78af1bd4a5ff6c380cc9b1f82192421e8f09da8fa9c2641a44e8c5c16f7a55f699f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "ad28f77aefc1702d13ff96a4340cc59729d62d8cb195b9b909f991ad7d2886884fadfb029243a35ae78e400f0a9873ff26a60d609e5f2be934bd74193e971542";
+      sha512 = "4e82ce00c4627ed3af79c1f83e02e25012603e17d8f45ad7a9bc6c89483017c9e4f6b97a4b7cf3cf46f3611d6ee66eb9757b9b40ccbe9d3eed0fb0119e630dee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "2a39367c11e5199a37b129f84011c724742d60496fa9d0abaaaad99b81dd42cfc170b49a91ee5227a138d2dc11f1558e2b6fcae1097f04195595e5a24d837910";
+      sha512 = "8a99eca4f7dd7c82e83e01d36160737d325d949fc423aa64abc1dffb82a404047c97512a046190c601b27236f48ab878df3858bd8d57bb0fbdaf9927abd269d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f8a3d491f4e2a4490df7948179d1f4a94c9d59f090512873853ac263632eb5b859eda30c630e00a37ba8834f53e7fe8803ff92f9c8c63b46fa11126e98b394e6";
+      sha512 = "798a246bd5ea6d8478b72d5105b43150e3754ad97d886bf1facf6469c44e1045d86fef9d7fc6ed66598cf9f8cc77e278d8cb04ead39afda5e280abdc5174907b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "67f172b6674f2afb59624ce91b3fd5c478447270324b97f0399ee4020c83befcacb04ba43a34d58a7bcb75ac4e3bfe09c51213e27a30285a5085219ca9254812";
+      sha512 = "2245df3c930f4d5754c83a6d50ac2af03c3a7a312907f00d12a2a555a4b3ca7678a2ae39b8166bfd2bd547aba4aa3d20bd4c6b4e3624d2cf73b59ffcebc24e8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c52abc55645828516da84e5a27374bdac3fadf939a916b728ed89f79ed3b63be2933a4a5d90f005935d14bf7d52a45311af2a63c0474a2749cdcba9a8943e83a";
+      sha512 = "0c4e948e1cd3aa773fcb38ff0399280a4dbc5c3f27751d1eb056e5d7157a4aaa00b7f437c45a9ad1ce566aad6831fdde7974d788dc336c8b79da095d44a52caf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6d690bc2fd294a58208935e4fbc63f286b4b2e719faccb918dd78b0a342afa278559347cf39ed1e7d040b85904dd9332397b129084d1aef267d488b3f3b4e272";
+      sha512 = "4115192841dd74ee49e5e8b28dc877e144b7b517141ad0919146d196abd822a4ea379544fcfb5ba457facb799913c381c7314e8a4f8acb1b2cc46fd0f787e604";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "4c364a343e569fb793f8f0373d4c689b403e6d4fa44e38eb8560e1572d03c7958dfae42e6e0c1aca4c43eef455c41f8d592084852d11c93cc2c6e8c219bf39aa";
+      sha512 = "b85f86fd806789849bd4bcea933578f70b38c8cafb9c52f6112cce1b3f4196291adfe03052cfd51e76ed8705df07a6d16776cb9de6d29bf8dec4eb77c24a1003";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f65c7091e5b6382401c9acd175df3e0ed4db61371b467a2d5eda4da97c718b06ca911796d9a8fcff55cab3420155eda88226b2ef3ff2f00bfbdc9801e71b6cf2";
+      sha512 = "069c073c8a2fd77c7a6de72b7b689e5e1d1596284bee7a18c33c55080b2d1382edde21c704fe45048f879ba8ba71b662470463b28ed67f1334f54f246399cee1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "ed38247a800564d8bc7c480fef34b342353d6fd6ae6cf9c77af3928d849cd0ae85d717a0e71429ea0bc0ab3cf11d66a8b68375159c25fdbb30379312880b390b";
+      sha512 = "d231cfe0e07ec369d7c69f3b2e25dc68798a614fb316b3accdf9ed3dc34b5482f504a550efba19f131ed6710363fda72751adf837a36324a13fb55662cb941e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "417b83980dc5019681d13989650019ad81a399a340b7388152648cc98f8e8c5740ad892b0a905e5dc4dab8f25f277b982783aa62d5846653caadbd40fca11a64";
+      sha512 = "3516dcdc5a7d7f5426c4326bdcc0c33f7c4f7fec85dbf8e161640322c6463c64248ea97f8314a1b9e1ca482cabf669bcb0b576892ca6bca941e829759ccfd068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "894e581f7596e7700234cdd0bf1dd787abcb3f088b12f7374e391cc2da834b4ff3737a4ba6ab1cf1b3d9ac43316551b794e4d0760559267f106369da9d8090da";
+      sha512 = "17dfdec17f967569109d94062935bcf0481011b42642a009d76888d7318a297adc8359408db1e1be815eb4421f4a64a30a3c9c5b9cbcdcda4be24c5a2e052655";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "8a258945d4a6ebcd92362bffa54ae7e1910ff53b2c8026978fa419407842349412b621213b3265da867183aab1ecb0ad5f7a01f0e994c411a4e4caeecba6ad55";
+      sha512 = "cdb4c9a805421d996d66e42cbf5c4189f3a1806fe27cd6cbe7d677dcc0f18841630bd73083de17273e20f130a3a381a65a4c1e267b6e204c0115dec8c6e50646";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "14319f1cfbba49420dd36d8c72df942ea7bbb8347e1354603709be1a74ea72e1cc347f906d14aa658f52a6a200b38212666175023fe60fa320abd08c5188b3c6";
+      sha512 = "81ba5089c9eebfcd1a16dfca14aae2d1f2cad3e2937808938d818e995b2d6ef62063d08372b31cf980464c0d7b80fe87e7115d8e9cba0ead5a4981404ae72266";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "699a1823692cff174f372ed91f42fb3e39789ef7eef98b2e7dd67586113b949ca36136f71b6ddd7671966e01cf782ee6503794d2c2728294b1c7dcecd960cc47";
+      sha512 = "5234f60af1fca63d501df28f570089b133e6659bacf875b2f977ff555971d836493392fdba1d187edb796616bec9538a158d01b72f06d8846a6b1f53ace61afb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "f32b70758b5da00462b02bee115e2fc17a75587996b32bd3ec6fde8de1be3b3d1639e813230545d218b94b23a74bfea71a47f6313e264914b14e624f2d5ffdc4";
+      sha512 = "5bfa1ee81c81c392f2c221ca691de094eca2abbfa1970b972a7db89f9cb9a95187f95aa96ab6a0ab7f9cf0c9d9cf52bd476e8b54199190371f45405dbfaad198";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "66b2ce7a9a315c7b79addd6579e82c8e28ba5d4629976b8eb848b9fc07ab86990470e71f767dde34279a0021c7d9670a74ac3cf9bf499403377d6fe6c7047288";
+      sha512 = "b1f0fb4a09a6895ebca561d587afef654f371f706678204cda0b67b3764d8e41629205999cdcef36fdcb786d6128a3df5947c265b461bc9427e6416b2dfdf5e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e29bf8120d1828f25664c66871bde593f5adeed9c5772d3d8460d4eab410387a05a68b4c61a1d909557b069eae31650a61694b0b938a269fd7eb026c9166a94f";
+      sha512 = "679f9a69b1ac386e92b1b1324fb12e4766f7876321d2eceb33d5d7e6244c70b7780491748699599da944223e17c5a1542986779acef26da5215d4b2e2408d2c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "0e87d74e3714b391a7adefe05432dbf3d0d0a59f8a042b02ecf3c26d08cf21fdb69e276965b801c942704c935a2190bdd381165c2e1eb76825e861268fe4e305";
+      sha512 = "9a446b70e7676c2d9ccf8d3dbcc203570a9421a771cc274cb271ed35a769c854a3c61caffbc5437d9e26e562d80784f01384215d2dda37de6da1b5fc617bb198";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "92530b4abcc39fd7411a432e4e0978cf9558970dc1a98b1f383f6878fada5e3d9cdd258e41b62876a768014c213afd577fb250c4688e234715841275e6f0b81b";
+      sha512 = "ddb1141d2312d663c3c4470bb1dfa2ac4171ec18aaf7fb8a3722ea627d571814b0f81495c28d95643547eebc012be816497bc632d650811c32a1f046aee6d7a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "65e8d369ee686ae8ad3e26bb72e768dc859e5c49c7a1cb93108309e917c97619984429a5fb3250f52276609a23ca330c49576aabce2fab99982940e92caeacc3";
+      sha512 = "4a8d82235af85a526e6f1035016fbea9e4cd89d82d9734d092fcf8a19e0aaed591f5a493f0616f0c892b02db7738193bb5aca2c4112d59062286bbdfd3d5e22b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8c81dcab1ecf4c63dfad587b12cccd8d130633c41a80964852866b31e5075946e40ae3b4ac38e46a986840dd72a1cc1e4da90d4fa5325c1c5c87e187593ad268";
+      sha512 = "a7fc6a43a7995dd08bc84d67c776fc45616d469d2af4a62948a910c4728af0242ff9fc70cde7bc0b1c64b71f97c4239ca45e3a1069eede8de92098bc97f93cf9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "3982eb2823a7bc4cfc2477e6b39f45b821f6e4f3a86e8941af5d308e5b3e9f299bac6bee27b1ae9a360d55a5be82bc08e39aad6058ad9d26520197a333d12b5f";
+      sha512 = "d3d4c9ebb1172fcd3c20cbed28dbb14b115fcb68bc817c396f8a26b143550fc1562aaa65442e609b091b94b26225f9021b6981b4863d23be97076a98fe092db8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "b6ac02641a856cde768dfb3d9bf3d843be1926c2be97690823d9b1b8acf6add653d388dbe388321e5149cf68b8b6e33228a698e3bcf84eacd073078f3fdeedaf";
+      sha512 = "89620e4ddbc92a4a35ccb408574abbc7dcf02717f0c22e2febf71a1b498fe93377fe959203acb0d46cbced9a2a8d63ca4d72adaf151665e58c29c38f157ea21a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "5df66816dc8bc2a094b62851c451c3276217b4f5f3223bee0c93d07cfdec5dc32092b85adf2a4bc924773abbb24aea1a734ca0a81d322513ab4c24a4429f186a";
+      sha512 = "85960d1395a5c3d12dda25260c6a4719eb7705ce5b7e66f384424272478d3fbe129984addf005a35c08a0735759b07f8984fe13d378f11a8c3d8fac5714ce049";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "08dc28f4affffe6c26ac26ba0e572e8b5b68c856317836b7e936cc88a2559c8ee92ac5ea1b796d0e42c614de4839aa3cd40e9e9bb7d1852262d92baf91255827";
+      sha512 = "f443b0442b5a9e512cc08e51eefec6a49cec0ca1e154de4e1c4d973498da28d8435ceeb1e89634cae5e373f6af2f4f8e4df2f4683bfc53318d47ff254b084b5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "173b0b854c3e0cc681d0e7b576e350b7912d6441345b8e9ac404523d12c49fbded11d561bc2c409c56da41022e0b683b8c1c39bea743eed4a0fec5dc8608ec16";
+      sha512 = "d24a276fce83acf32eb3c067a102f51e75fb351eeeeb7e1bbfa4e533c33f8ac8ebe128e2baefbed9162d3bcf64852b88acb0775414c129ff7e66d64901fef215";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "73edb5fb6138df5f4a48f246a36fa36f2b1d3b8196cec6e3de7fc2258bfa6cbf1c4fa2b30eabcafc76bed63f59fd824d6956367f151b5edc5346b5f3f9fae29b";
+      sha512 = "2f025bb5c5e550ba9f10200bf1a56d5a33f6c80aeab5b9937596a3b19ea0b094affe8734ae4252e5f2a3ffa50ff437dcdaec44754312e1cf34f4b317f86ec72c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "440c8176c33d9c9d32dfee994a6e19f25fd66334e5654b13472e31a3bba0e3aba82848b5c8f14762a8192ba2c391c8e32775ad856d99ed66cbca22ad246cf61b";
+      sha512 = "9127e226fdaba68cac0fd0e8a977f3ef85e8cacd31d7021ea1a9e30b39acc11b0e4c3d78db2fc09b596e5de7806ef74fb48c3de0ea6e6c5c7c3915133e583ef8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ec372b7fba0127ef08ab288e97590b3e0a70739a8d36d874d3a7a140c2e01fe186c80122aa96b6ac46bb4937911ff1f0d3e9c50f03240a931c63f43540e07cf1";
+      sha512 = "112f6ddef9565c7065c9c47c9b412940fdbd5bb4606ff2ead622eb536943ef42d9c2a1791357f02da797ac7ad73decad3e6aecad43366cb6e69fadb7706d931c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5bd52abe9e2bd74bac9b372a26075e32647f09da235046926449ff252b12d9f7b67b3af2e66190db0ab344d62f367f0e2e9d57078ffbd0f758cff0140fb3570d";
+      sha512 = "de9531b0f128a8d9c33e3c25f67ef78977053b84abeb482a39008c06f96b08c2f3fa699313ad68c1d8e1f29147bc00cabdc30efa7d15dff47a7db9252c9fb568";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "f06bc7d0af089eadb7f465b997f2f626347fdf2d418e9c5c74f3f9b810faa67977575600ae8e20ee888eb0acdc9da9378eb26044d8cc2ee0ef611c4d4ee88526";
+      sha512 = "5bfb920fad1399e7e1c3287ef38175b901ea230261863b45e79850a2d1e2b779dce89dde073e76f7da474f1a1cd1f09aa9ead8fbbe5caeb763a9d0b683c4fbf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "c29b7090f8890ba26e8d3c8a32fafa7a56b0618109547b3f911304029f831aeb6eea7407e165d1b2643d98153df86c358978da4cf4ae301bcdbe9b287667816e";
+      sha512 = "5ee7e8cc7752c48a1de329c65753bafb6df0b7cf8a56534521a85b132f41ce0836ef0163b17104a7132eee38a5facc2a5f9de7aab31677b33726def9be4662ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8caad6ef2d4302b0ac0d41344a5c8c1e6ce490dbaee8b727d2113a47354c56a4ab7c62925875fe52f946d7850111358a1c24890fcdea6b62f3e2e716d907d82c";
+      sha512 = "3fbaf21aa3d1e4e8feade93d015eecc97a50d6dec6e3aa487d450f53348297d1c48e38cd221282fc6ab4fb00fec099962225406ac89329519ccaed588a75ef88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5e9f415e6c6d706b9fa895e6166b147ddb53b5d7f86d556e436736dd469f2478d9807ec9a8453e54829fe4a34c97d85a6c4854e9ff8e67d5f4c5e0194d626f13";
+      sha512 = "0dd9331f4ab4c35559551d433ecd1a2ea2ef917d1b04dc8b727a77540318100337b73a4500b0ccbfb24fa853b2749df5c74820af794a9579423e9aaa4b62a71f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "f74eb03c0d08cc80c9c8954d23e70b2356fcc530c4fff4b38cbff17e7d295fe065a2388042d52eca2297ae9234cf3fb1735448ee767b8ca087cc5189b8c15016";
+      sha512 = "ddf351df58fdfcca150012fb033055ef0b3e5175b587dbe9a1ad92144c5170f765c90cd8b8405aac85b7f16da1f4bfbf6316eaa8f45144397a06a11aa944cc75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "160a29622cbd47af6a914a20554b0f64786aabe06496e2cb0f647bb722f405922d52fcb7e49f6f44441641a1e987f6ad70bc1e995a63e691f2cab685e5192b25";
+      sha512 = "d838e1ba30654631926a16ac3b8fec40989da3a0ffb95ae59990f9a22cf560e30222941777241c94b5cce9336f073df1d5a6472003481b36ac514c6ae12376be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "369171223ce036e3066abeeb30b14b4206a89824cca71e5a42b83ed00652e30fdd297670659e55e923298e26c4f256d18041f6dcabb71268641e940c2a753fe7";
+      sha512 = "3925df8ea333c2a9bf1c3e5fc09c5d6d662aa2644fd34f81f94221d895514989fe1e35ef3b688cafc13229744e3c8f6e2af08c5d08c10ee2544418195cbe3221";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "12179e32d115d8077cd9d765f3aa9131fca58645515ecee0c9b9f853fbc498fa4c93cc2c29eada9f3c487658ba1a13815a85ad9d4d9bc4e81d0f1122b132afc8";
+      sha512 = "ee80ae9b0332432a9afeac420484cb0649a0ea947fd869835c41973ef82c10ec1c469105efad08f6a6bba56f0fe7fa27ecdb8fa939fe210902f3dfe18fa6ae4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "69c276cbd9e5541c27accd171308ac575cb86c25035800b80eb3fa3a7962c55da79fff129b8c6cd96710481c3aa51d94ad8daa3bad200408ab138a90e59d7826";
+      sha512 = "fc7f6bc1d948a3572ff3aa169858b0bb1b63c9dce3128cb4f55177e45f17554813e2a65daa4f7ff1a2c870022535ac556f98ac28f58490d5914abcaf8bb9c7ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c670e1ae6e93e54d71737f6fcdad8398a61e6a0184efc8690567bfaf3e71a97c25ce852886442d74d8bbcea2dbefdc8bf498db602cd0e9b61ffe09fa6978f198";
+      sha512 = "ee9f587298401f6895503c109e735cb73bf60ef85891a189dc27dcb752b9c40d9b91e9bc943aa6d393be80575a90ed6f1dd1b181590133173735f71ffb517546";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "dd74b6ebe0d820b808444ad87dc21c72490cb56dc6e3cc0b80e979074456d9f9df8538fe64326fc9d1e9825e9e2846efab87ca3e43282ced753effdf605746cb";
+      sha512 = "8a871f77be68b897cc5ac78a8f83984954f16b55459ab46ede1f970cb912ba7c0326de9c39ce1847bcb41c1eaf032707ad7dc8754f7c6c7520551ab8ab7c98d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "1e7e2dc1456772c6fb9c9bf7dc41136d0466643db2757ac865dd6595b46e38a1f4c0c10f0e34dc11da5f66fe8e810ab512a39ee21ee5d1470ce46e79a6cf568f";
+      sha512 = "6f592662d17b121d0b8d7dd25441b9c948432ab55ffc2f8e34415e9eaf75e97ba707bcff00afbba84d1b664e69598897c3a4595332b14e533378eaf52dc830c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c9521852c781e2b57c6dd6dee07c184525b61eaca7ed49e4cd792608e7ecf4268ea4fd02a19c86cde07e0493dc4ef360716fed4ec51e03b8eab11af98c55ac3a";
+      sha512 = "f69ed795a4262c4288a2942845caaab66375d9db4d955fb22535862a29b18217e8f8bedb2ffffeade15f5276e8a76bbac2f0c0ae31b7851b20c696ed1b8605bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "234a05c330e0b13396b523a522439106015dce8c6b76f49becc2e8e9498e325b73d35cab168950e059d79a0220bca2845fcd09940b29336277643733f742f316";
+      sha512 = "9834484be2696bc4caba686dd4a87bc2a15a1c6125468d570cc1ac837ec111e2fac22b04f6d2226ba705c04e69195e95258848ba9ef0711fc2cbdbb1521302b1";
     }
     ];
 }
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
new file mode 100644
index 00000000000..201e3e8b30d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, lib, ... }:
+
+stdenv.mkDerivation rec {
+  name = "kubetail-${version}";
+  version = "1.6.1";
+
+  src = fetchFromGitHub {
+    owner = "johanhaleby";
+    repo = "kubetail";
+    rev = "${version}";
+    sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl";
+  };
+
+  installPhase = ''
+    install -Dm755 kubetail $out/bin/kubetail
+  '';
+
+  meta = with lib; {
+    description = "Bash script to tail Kubernetes logs from multiple pods at the same time";
+    longDescription = ''
+      Bash script that enables you to aggregate (tail/follow) logs from
+      multiple pods into one stream. This is the same as running "kubectl logs
+      -f " but for multiple pods.
+    '';
+    homepage = https://github.com/johanhaleby/kubetail;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 430357cc666..ec3bb6a463e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -77,6 +77,6 @@ let unwrapped = stdenv.mkDerivation rec {
 
 in if plugins == [] then unwrapped
     else import ./wrapper.nix {
-      inherit stdenv makeWrapper symlinkJoin plugins;
+      inherit makeWrapper symlinkJoin plugins;
       pidgin = unwrapped;
     }
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 74d59c05ec9..a82891a8f35 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
 , glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
 , libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
-, gobjectIntrospection, glib-networking
+, gobjectIntrospection, glib-networking, hicolor-icon-theme
 }:
 
 let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
     libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection
-    librsvg glib-networking libnotify
+    librsvg glib-networking libnotify hicolor-icon-theme
   ] ++ (with gst_all_1; [
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
   ]);
@@ -28,7 +28,6 @@ in stdenv.mkDerivation rec {
   pythonPath = with python3Packages; [ pygobject3 pycairo ];
 
   preFixup = ''
-    rm "$out/share/icons/hicolor/icon-theme.cache"
     buildPythonPath "$out $pythonPath"
     gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index d9ddf045921..b94864a0b40 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
-, openssl, curl, libevent, inotify-tools, systemd, zlib
+, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
 , enableDaemon ? true
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool file openssl curl libevent zlib ]
     ++ optionals enableGTK3 [ gtk3 ]
     ++ optionals enableSystemd [ systemd ]
-    ++ optionals stdenv.isLinux [ inotify-tools ];
+    ++ optionals stdenv.isLinux [ inotify-tools ]
+    ++ optionals enableGTK3 [ hicolor-icon-theme ];
 
   postPatch = ''
     substituteInPlace ./configure \
@@ -39,10 +40,6 @@ stdenv.mkDerivation rec {
     ++ optional enableSystemd "--with-systemd-daemon"
     ++ optional enableGTK3 "--with-gtk";
 
-  preFixup = optionalString enableGTK3 ''
-    rm "$out/share/icons/hicolor/icon-theme.cache"
-  '';
-
   NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix
new file mode 100644
index 00000000000..78910d1ecf6
--- /dev/null
+++ b/pkgs/applications/networking/sieve-connect/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec {
+  name = "sieve-connect-${version}";
+  version = "0.89";
+
+  src = fetchFromGitHub {
+    owner = "philpennock";
+    repo = "sieve-connect";
+    rev = "v${version}";
+    sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp";
+  };
+
+  buildInputs = [ perl ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  preBuild = ''
+    # Fixes failing build when not building in git repo
+    mkdir .git
+    touch .git/HEAD
+    echo "${version}" > versionfile
+    echo "$(date +%Y-%m-%d)" > datefile
+  '';
+
+  buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    install -m 755 sieve-connect $out/bin
+    gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz
+
+    wrapProgram $out/bin/sieve-connect \
+      --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [
+        AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage
+        TermReadKey TermReadLineGnu ])}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A client for the MANAGESIEVE Protocol";
+    longDescription = ''
+      This is sieve-connect. A client for the ManageSieve protocol,
+      as specifed in RFC 5804. Historically, this was MANAGESIEVE as
+      implemented by timsieved in Cyrus IMAP.
+    '';
+    homepage = https://github.com/philpennock/sieve-connect;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ das_j ];
+  };
+}
diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix
index 252c6d878d0..b4e962ce3fc 100644
--- a/pkgs/applications/office/gnucash/2.4.nix
+++ b/pkgs/applications/office/gnucash/2.4.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
 , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
 , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
-, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
+, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
 }:
 
 /* If you experience GConf errors when running GnuCash on NixOS, see
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     libgnomeprint goffice enchant gettext intltool perl guile slibGuile
     swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
     perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
+    hicolor-icon-theme
   ];
   propagatedUserEnvPkgs = [ gconf ];
 
@@ -49,8 +50,6 @@ stdenv.mkDerivation rec {
         --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
         --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
     done
-
-    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   # The following settings fix failures in the test suite. It's not required otherwise.
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 4d85374ee9a..471d2d757d9 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -3,7 +3,7 @@
 , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings-desktop-schemas, dconf
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
-, pango, gdk_pixbuf
+, pango, gdk_pixbuf, hicolor-icon-theme
 }:
 
 /*
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libxml2 libxslt glibcLocales gettext swig enchant
     bzip2 isocodes
     # glib, gtk...
-    glib gtk2 goffice webkit
+    glib gtk2 goffice webkit hicolor-icon-theme
     # gnome...
     dconf gconf libgnomecanvas gsettings-desktop-schemas
     # financial
@@ -83,8 +83,6 @@ stdenv.mkDerivation rec {
         --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"  \
         --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
     done
-
-    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   # The following settings fix failures in the test suite. It's not required otherwise.
diff --git a/pkgs/applications/science/astronomy/openspace/assets.patch b/pkgs/applications/science/astronomy/openspace/assets.patch
new file mode 100644
index 00000000000..38c17ad4593
--- /dev/null
+++ b/pkgs/applications/science/astronomy/openspace/assets.patch
@@ -0,0 +1,100 @@
+diff --git a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
+index c15f6d9..1f8ddaf 100755
+--- a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
++++ b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Jupiter Spice Kernels (jup310)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "jup310",
+-    Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
++-- local Kernels = asset.syncedResource({
++--     Name = "Jupiter Spice Kernels (jup310)",
++--     Type = "TorrentSynchronization",
++--     Identifier = "jup310",
++--     Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
++-- })
+ 
+-asset.export("Kernels", Kernels .. '/jup310.bsp')
++-- asset.export("Kernels", Kernels .. '/jup310.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/mars/mar097.asset b/data/assets/scene/solarsystem/planets/mars/mar097.asset
+index e77d67d..8d738a6 100755
+--- a/data/assets/scene/solarsystem/planets/mars/mar097.asset
++++ b/data/assets/scene/solarsystem/planets/mars/mar097.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Mars Spice Kernels",
+-    Type = "TorrentSynchronization",
+-    Identifier = "mat097",
+-    Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
++-- local Kernels = asset.syncedResource({
++--     Name = "Mars Spice Kernels",
++--     Type = "TorrentSynchronization",
++--     Identifier = "mat097",
++--     Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
++-- })
+ 
+-asset.export("Kernels", Kernels .. '/mar097.bsp')
++-- asset.export("Kernels", Kernels .. '/mar097.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/neptune/nep081.asset b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
+index e9c49ce..cfb5fac 100755
+--- a/data/assets/scene/solarsystem/planets/neptune/nep081.asset
++++ b/data/assets/scene/solarsystem/planets/neptune/nep081.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Neptune Spice Kernels (nep081)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "nep081",
+-    Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
++-- local Kernels = asset.syncedResource({
++--     Name = "Neptune Spice Kernels (nep081)",
++--     Type = "TorrentSynchronization",
++--     Identifier = "nep081",
++--     Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
++-- })
+ 
+-asset.export("Kernels", Kernels .. '/nep081.bsp')
++-- asset.export("Kernels", Kernels .. '/nep081.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/saturn/sat375.asset b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
+index a55f2ed..f904b3c 100755
+--- a/data/assets/scene/solarsystem/planets/saturn/sat375.asset
++++ b/data/assets/scene/solarsystem/planets/saturn/sat375.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Saturn Spice Kernels (sat375)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "sat375",
+-    Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
+-})
++-- local Kernels = asset.syncedResource({
++--     Name = "Saturn Spice Kernels (sat375)",
++--     Type = "TorrentSynchronization",
++--     Identifier = "sat375",
++--     Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp"
++-- })
+ 
+-asset.export("Kernels", Kernels .. '/sat375.bsp')
++-- asset.export("Kernels", Kernels .. '/sat375.bsp')
+diff --git a/data/assets/scene/solarsystem/planets/uranus/ura111.asset b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
+index 665d059..8f95f34 100755
+--- a/data/assets/scene/solarsystem/planets/uranus/ura111.asset
++++ b/data/assets/scene/solarsystem/planets/uranus/ura111.asset
+@@ -1,8 +1,8 @@
+-local Kernels = asset.syncedResource({
+-    Name = "Uranus Spice Kernels (ura111)",
+-    Type = "TorrentSynchronization",
+-    Identifier = "ura111",
+-    Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
+-})
++-- local Kernels = asset.syncedResource({
++--     Name = "Uranus Spice Kernels (ura111)",
++--     Type = "TorrentSynchronization",
++--     Identifier = "ura111",
++--     Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce"
++-- })
+ 
+-asset.export("Kernels", Kernels .. '/ura111.bsp')
++-- asset.export("Kernels", Kernels .. '/ura111.bsp')
diff --git a/pkgs/applications/science/astronomy/openspace/config.patch b/pkgs/applications/science/astronomy/openspace/config.patch
new file mode 100644
index 00000000000..826edea0907
--- /dev/null
+++ b/pkgs/applications/science/astronomy/openspace/config.patch
@@ -0,0 +1,49 @@
+diff --git a/openspace.cfg b/openspace.cfg
+index c86830b..e7f89d9 100755
+--- a/openspace.cfg
++++ b/openspace.cfg
+@@ -2,18 +2,21 @@
+ -- require('scripts/configuration_helper.lua')
+ -- which defines helper functions useful to customize the configuration
+ 
++userdir = os.getenv("HOME") .. "/.openspace/"
++os.execute("mkdir -p " .. userdir)
++
+ return {
+     -- Determines which SGCT configuration file is loaded, that is, if there rendering
+     -- occurs in a single window, a fisheye projection, or a dome cluster system
+ 
+     -- A regular 1280x720 window
+-    SGCTConfig = sgct.config.single{},
++    -- SGCTConfig = sgct.config.single{},
+ 
+     -- A regular 1920x1080 window
+     -- SGCTConfig = sgct.config.single{1920, 1080},
+     
+     -- A windowed 1920x1080 fullscreen
+-    -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
++    SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
+ 
+     -- A 1k fisheye rendering
+     -- SGCTConfig = sgct.config.fisheye{1024, 1024},
+@@ -53,15 +56,15 @@ return {
+         TASKS = "${DATA}/tasks",
+         WEB = "${DATA}/web",
+ 
+-        CACHE = "${BASE}/cache",
++        CACHE  = userdir .. "cache",
+         CONFIG = "${BASE}/config",
+-        DOCUMENTATION = "${BASE}/documentation",
+-        LOGS = "${BASE}/logs",
++        DOCUMENTATION = userdir .. "documentation",
++        LOGS    = userdir .. "logs",
+         MODULES = "${BASE}/modules",
+         SCRIPTS = "${BASE}/scripts",
+         SHADERS = "${BASE}/shaders",
+-        SYNC = "${BASE}/sync",
+-        TESTDIR = "${BASE}/tests"
++        SYNC    = userdir .. "sync",
++        TESTDIR = userdir .. "tests"
+     },
+     Fonts = {
+         Mono = "${FONTS}/Bitstream-Vera-Sans-Mono/VeraMono.ttf",
diff --git a/pkgs/applications/science/astronomy/openspace/constexpr.patch b/pkgs/applications/science/astronomy/openspace/constexpr.patch
new file mode 100644
index 00000000000..d9fc91d7c27
--- /dev/null
+++ b/pkgs/applications/science/astronomy/openspace/constexpr.patch
@@ -0,0 +1,91 @@
+diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
+index 80a3a96..7059752 100755
+--- a/include/openspace/util/distanceconversion.h
++++ b/include/openspace/util/distanceconversion.h
+@@ -159,24 +159,34 @@ constexpr const char* nameForDistanceUnit(DistanceUnit unit, bool pluralForm = f
+ }
+ 
+ constexpr DistanceUnit distanceUnitFromString(const char* unitName) {
++    int result = -1;
++  
+     int i = 0;
+     for (const char* val : DistanceUnitNamesSingular) {
+         if (ghoul::equal(unitName, val)) {
+-            return static_cast<DistanceUnit>(i);
++            result = i;
++            break;
+         }
+         ++i;
+     }
+ 
+-    i = 0;
+-    for (const char* val : DistanceUnitNamesPlural) {
+-        if (ghoul::equal(unitName, val)) {
+-            return static_cast<DistanceUnit>(i);
++    if (result == -1) {
++        i = 0;
++        for (const char* val : DistanceUnitNamesPlural) {
++            if (ghoul::equal(unitName, val)) {
++                result = i;
++                break;
++            }
++            ++i;
+         }
+-        ++i;
+     }
+ 
+-    ghoul_assert(false, "Unit name is not a valid name");
+-    throw ghoul::MissingCaseException();
++    if (result != -1)
++        return static_cast<DistanceUnit>(result);
++    else {
++        ghoul_assert(false, "Unit name is not a valid name");
++        throw ghoul::MissingCaseException();
++    }
+ }
+ 
+ 
+diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
+index a36c92a..699bca9 100755
+--- a/include/openspace/util/timeconversion.h
++++ b/include/openspace/util/timeconversion.h
+@@ -142,23 +142,32 @@ constexpr const char* nameForTimeUnit(TimeUnit unit, bool pluralForm = false) {
+ }
+ 
+ constexpr TimeUnit timeUnitFromString(const char* unitName) {
++    int result = -1;
++    
+     int i = 0;
+     for (const char* val : TimeUnitNamesSingular) {
+         if (ghoul::equal(unitName, val)) {
+-            return static_cast<TimeUnit>(i);
++            result = i;
++            break;
+         }
+         ++i;
+     }
+ 
+-    i = 0;
+-    for (const char* val : TimeUnitNamesPlural) {
+-        if (ghoul::equal(unitName, val)) {
+-            return static_cast<TimeUnit>(i);
++    if (result == -1) {
++        i = 0;
++        for (const char* val : TimeUnitNamesPlural) {
++            if (ghoul::equal(unitName, val)) {
++                result = i;
++                break;
++            }
++            ++i;
+         }
+-        ++i;
+     }
+ 
+-    throw ghoul::MissingCaseException();
++    if (result != -1)
++        return static_cast<TimeUnit>(result);
++    else
++        throw ghoul::MissingCaseException();
+ }
+ 
+ std::pair<double, std::string> simplifyTime(double seconds,
diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix
new file mode 100644
index 00000000000..ee3a71cf181
--- /dev/null
+++ b/pkgs/applications/science/astronomy/openspace/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, cmake
+, curl, boost, gdal, glew, soil
+, libX11, libXi, libXxf86vm, libXcursor, libXrandr, libXinerama }:
+
+stdenv.mkDerivation rec {
+  version = "0.11.1";
+  name    = "openspace-${version}";
+  
+  src = fetchFromGitHub {
+    owner  = "OpenSpace";
+    repo   = "OpenSpace";
+    rev    = "a65eea61a1b8807ce3d69e9925e75f8e3dfb085d";
+    sha256 = "0msqixf30r0d41xmfmzkdfw6w9jkx2ph5clq8xiwrg1jc3z9q7nv";
+    fetchSubmodules = true;
+  };
+  
+  buildInputs = [
+    makeWrapper cmake
+    curl boost gdal glew soil
+    libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
+  ];
+      
+  glmPlatformH = fetchurl {
+    url    = "https://raw.githubusercontent.com/g-truc/glm/dd48b56e44d699a022c69155c8672caacafd9e8a/glm/simd/platform.h";
+    sha256 = "0y91hlbgn5va7ijg5mz823gqkq9hqxl00lwmdwnf8q2g086rplzw";
+  };
+  
+  # See <https://github.com/g-truc/glm/issues/726>
+  prePatch = ''
+    cp ${glmPlatformH} ext/sgct/include/glm/simd/platform.h
+    cp ${glmPlatformH} ext/ghoul/ext/glm/glm/simd/platform.h
+  '';
+  
+  patches = [
+    # See <https://github.com/opensgct/sgct/issues/13>
+    ./vrpn.patch
+    
+    ./constexpr.patch
+    ./config.patch
+
+    # WARNING: This patch disables some slow torrents in a very dirty way.
+    ./assets.patch 
+  ];
+  
+  bundle = "$out/usr/share/openspace";
+  
+  preConfigure = ''
+    cmakeFlagsArray=(
+      $cmakeFlagsArray
+      "-DCMAKE_BUILD_TYPE="
+      "-DCMAKE_INSTALL_PREFIX=${bundle}"
+    )
+  '';
+  
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p ${bundle}
+  '';
+  
+  postInstall = ''
+    cp ext/spice/libSpice.so       ${bundle}/lib
+    cp ext/ghoul/ext/lua/libLua.so ${bundle}/lib
+  '';
+  
+  postFixup = ''
+    for bin in ${bundle}/bin/*
+    do
+      rpath=$(patchelf --print-rpath $bin)
+      patchelf --set-rpath $rpath:${bundle}/lib $bin
+      
+      name=$(basename $bin)
+      makeWrapper $bin $out/bin/$name --run "cd ${bundle}"
+    done
+  '';
+  
+  meta = {
+    description     = "Open-source astrovisualization project";
+    longDescription = ''
+      OpenSpace is open source interactive data visualization software
+      designed to visualize the entire known universe and portray our
+      ongoing efforts to investigate the cosmos.
+
+      WARNING: This build is not very usable for now.
+    '';
+    homepage  = https://www.openspaceproject.com/;
+    license   = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/science/astronomy/openspace/vrpn.patch b/pkgs/applications/science/astronomy/openspace/vrpn.patch
new file mode 100644
index 00000000000..9386d0257b7
--- /dev/null
+++ b/pkgs/applications/science/astronomy/openspace/vrpn.patch
@@ -0,0 +1,13 @@
+diff --git a/ext/sgct/src/deps/vrpn/vrpn_Connection.C b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
+index d6ffdc5..f90a2b2 100755
+--- a/ext/sgct/src/deps/vrpn/vrpn_Connection.C
++++ b/ext/sgct/src/deps/vrpn/vrpn_Connection.C
+@@ -2489,7 +2489,7 @@ static int vrpn_start_server(const char *machine, char *server_name, char *args,
+ #if defined(sparc) || defined(FreeBSD) || defined(_AIX) || defined(__ANDROID__)
+             int status; // doesn't exist on sparc_solaris or FreeBSD
+ #else
+-            union wait status;
++            int status;
+ #endif
+ 
+             /* Check to see if they called back yet. */
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index d32beeef4f4..6a0b686602f 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -9,7 +9,7 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
 stdenv.mkDerivation rec {
   name = "${attr}-${version}";
   attr = if enableGUI then "giac-with-xcas" else "giac";
-  version = "1.4.9-59";
+  version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade
 
   src = fetchurl {
     url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
@@ -50,6 +50,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "doc" ];
 
   doCheck = true;
+  preCheck = ''
+    # One test in this file fails. That test just tests a part of the pari
+    # interface that isn't actually used in giac. Of course it would be better
+    # to only remove that one test, but that would require a patch.
+    # Removing the whole test set should be good enough for now.
+    # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326
+    echo > check/chk_fhan11
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index a811c9da8c2..9fe1d9df46d 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
 stdenv.mkDerivation rec {
 
   name = "pari-${version}";
-  version = "2.9.5";
+  version = "2.11.0";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
+    sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q";
   };
 
   buildInputs = [
@@ -67,8 +67,8 @@ stdenv.mkDerivation rec {
           run 3 or 4 times faster.) gp2c currently only understands a subset
            of the GP language.
     '';
-    homepage    = "http://pari.math.u-bordeaux.fr/";
-    downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
+    homepage    = http://pari.math.u-bordeaux.fr;
+    downloadPage = http://pari.math.u-bordeaux.fr/download.html;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ ertes raskin AndersonTorres ];
     platforms   = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 8be302f41e5..98b75cd22d0 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig
+, lib
 , autoreconfHook
 , file
 , flint
@@ -9,21 +10,25 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "singular-${version}${patchVersion}";
-  version = "4.1.1";
-  patchVersion = "p1";
+  name = "singular-${version}";
+  version = "4.1.1p2";
 
-  urlVersion = builtins.replaceStrings [ "." ] [ "-" ] version;
-  src = fetchurl {
-    url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}${patchVersion}.tar.gz";
-    sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1";
+  src = let
+    # singular sorts its tarballs in directories by base release (without patch version)
+    # for example 4.1.1p1 will be in the directory 4-1-1
+    baseVersion = builtins.head (lib.splitString "p" version);
+    urlVersion = builtins.replaceStrings [ "." ] [ "-" ] baseVersion;
+  in
+  fetchurl {
+    url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}.tar.gz";
+    sha256 = "07x9kri8vl4galik7lr6pscq3c51n8570pyw64i7gbj0m706f7wf";
   };
 
   configureFlags = [
     "--with-ntl=${ntl}"
-  ] ++stdenv.lib.optionals enableFactory [
+  ] ++ lib.optionals enableFactory [
     "--enable-factory"
-  ] ++ stdenv.lib.optionals enableGfanlib [
+  ] ++ lib.optionals enableGfanlib [
     "--enable-gfanlib"
   ];
 
@@ -42,7 +47,7 @@ stdenv.mkDerivation rec {
     readline
     ntl
     flint
-  ] ++ stdenv.lib.optionals enableGfanlib [
+  ] ++ lib.optionals enableGfanlib [
     cddlib
   ];
   nativeBuildInputs = [
@@ -60,10 +65,12 @@ stdenv.mkDerivation rec {
       -i '{}' ';'
   '';
 
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
+  hardeningDisable = lib.optional stdenv.isi686 "stackprotector";
 
   # The Makefile actually defaults to `make install` anyway
-  buildPhase = "true;";
+  buildPhase = ''
+    # do nothing
+  '';
 
   installPhase = ''
     mkdir -p "$out"
@@ -77,7 +84,7 @@ stdenv.mkDerivation rec {
   # simple test to make sure singular starts and finds its libraries
   doInstallCheck = true;
   installCheckPhase = ''
-    $out/bin/Singular -c 'LIB "freegb.lib"; exit;'
+    "$out/bin/Singular" -c 'LIB "freegb.lib"; exit;'
     if [ $? -ne 0 ]; then
         echo >&2 "Error loading the freegb library in Singular."
         exit 1
@@ -86,9 +93,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CAS for polynomial computations";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin timokau ];
+    # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
     platforms = subtractLists platforms.i686 platforms.linux;
     license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
     homepage = http://www.singular.uni-kl.de;
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 9ff0f4e6e9b..6cc109c48c7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -244,6 +244,7 @@ EOF
 
   ## InstallCheck
 
+  doCheck = false;
   doInstallCheck = true;
 
   installCheckTarget = "test";
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 001ee2ddb68..5b0ba0aba7d 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tig";
-  version = "2.3.3";
+  version = "2.4.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
     rev = name;
-    sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap";
+    sha256 = "1d5clkdgj0ip1j0k335pr4dabcnap6jr016q90i49p1jxixy96pb";
   };
 
   nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 5f8619b4a7f..85514ed4786 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "15iqvfvijg46444pybi7vg7xhl2x0pr5p1416qlc2nakkn3drpi1";
+    sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd";
   };
 
   patches = [ ./static-root-path.patch ];
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 32dd3e6ff75..2f27eb83884 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -10,7 +10,7 @@
   libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
   lame, libdvdread, libdvdnav, libbluray,
   mp4v2, mpeg2dec, x264, x265, libmkv,
-  fontconfig, freetype,
+  fontconfig, freetype, hicolor-icon-theme,
   glib, gtk3, intltool, libnotify,
   gst_all_1, dbus-glib, udev, libgudev, libvpx,
   useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals useGtk [
     glib gtk3 libappindicator-gtk3 libnotify
     gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
-    libgudev
+    libgudev hicolor-icon-theme
   ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
   ++ lib.optional useFdk fdk_aac;
 
@@ -82,11 +82,6 @@ stdenv.mkDerivation rec {
     cd build
   '';
 
-  # icon-theme.cache belongs in the icon theme, not in individual packages
-  postInstall = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://handbrake.fr/;
     description = "A tool for converting video files and ripping DVDs";
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index e3954598cbe..a6f7f55cad7 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -74,21 +74,21 @@ assert drmSupport         -> available libdrm;
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
-  wafVersion = "1.9.15";
+  wafVersion = "2.0.9";
   waf = fetchurl {
     urls = [ "https://waf.io/waf-${wafVersion}"
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
-    sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
+    sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia";
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.28.2";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg";
+    sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3";
   };
 
   postPatch = ''
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 2739537c25d..91f9e7c71e3 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -185,6 +185,8 @@ stdenv.mkDerivation {
           "mips64"   = "btsmip";
           "mips64el" = "ltsmip";
         }.${targetPlatform.parsed.cpu.name}
+      else if targetPlatform.isPowerPC then "powerpc"
+      else if targetPlatform.isSparc then "sparc"
       else throw "unknown emulation for platform: " + targetPlatform.config;
     in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
 
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 025f6aa6e7a..f65b792485a 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -20,7 +20,13 @@ bintoolsWrapper_addLDVars () {
     fi
 
     if [[ -d "$1/lib" ]]; then
-        export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
+        # Don't add the /lib directory if it actually doesn't contain any libraries. For instance,
+        # Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or
+        # $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary
+        # directories and bloats the size of the environment variable space.
+        if [[ -n "$(echo $1/lib/lib*)" ]]; then
+            export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
+        fi
     fi
 }
 
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 30df3e8e733..b9da06c43c8 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -16,10 +16,11 @@ infoFile: let
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let
       inherit (dep)
-        url sha1 groupId artifactId version
-        authenticated metadata repository-id;
+        url sha1 groupId artifactId
+        version metadata repository-id;
 
       versionDir = dep.unresolved-version or version;
+      authenticated = dep.authenticated or false;
 
       fetch = (if authenticated then requireFile else fetchurl) {
         inherit url sha1;
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 950c0c86a6e..bc79f9ff12f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -36,10 +36,11 @@ rec {
   in
     { imageName
       # To find the digest of an image, you can use skopeo:
-      # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
-      # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+      # see doc/functions.xml
     , imageDigest
     , sha256
+    , os ? "linux"
+    , arch ? "x86_64"
       # This used to set a tag to the pulled image
     , finalImageTag ? "latest"
     , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
@@ -59,7 +60,7 @@ rec {
       sourceURL = "docker://${imageName}@${imageDigest}";
       destNameTag = "${imageName}:${finalImageTag}";
     } ''
-      skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag"
+      skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag"
     '';
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 5fa45b154a3..2ee99ce973e 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -5,7 +5,15 @@
 
 with lib;
 
-{ pname
+{ /*
+    pname: Nix package name without special symbols and without version or
+    "emacs-" prefix.
+  */
+  pname
+  /*
+    ename: Original Emacs package name, possibly containing special symbols.
+  */
+, ename ? null
 , version
 , recipe
 , meta ? {}
@@ -22,6 +30,11 @@ in
 
 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
 
+  ename =
+    if isNull(ename)
+    then pname
+    else ename;
+
   melpa = fetchFromGitHub {
     owner = "melpa";
     repo = "melpa";
@@ -35,7 +48,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   preUnpack = ''
     mkdir -p "$NIX_BUILD_TOP/recipes"
     if [ -n "$recipe" ]; then
-      cp "$recipe" "$NIX_BUILD_TOP/recipes/$pname"
+      cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename"
     fi
 
     ln -s "$melpa/package-build" "$NIX_BUILD_TOP/package-build"
@@ -45,7 +58,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
 
   postUnpack = ''
     mkdir -p "$NIX_BUILD_TOP/working"
-    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$pname"
+    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
   '';
 
   buildPhase =
@@ -58,7 +71,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
           -L "$melpa/package-build" \
           -l "$melpa2nix" \
           -f melpa2nix-build-package \
-          $pname $version
+          $ename $version
 
       runHook postBuild
     '';
@@ -66,9 +79,9 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   installPhase = ''
     runHook preInstall
 
-    archive="$NIX_BUILD_TOP/packages/$pname-$version.el"
+    archive="$NIX_BUILD_TOP/packages/$ename-$version.el"
     if [ ! -f "$archive" ]; then
-        archive="$NIX_BUILD_TOP/packages/$pname-$version.tar"
+        archive="$NIX_BUILD_TOP/packages/$ename-$version.tar"
     fi
 
     emacs --batch -Q \
diff --git a/pkgs/build-support/setup-hooks/remove-pytest-cache.sh b/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
new file mode 100644
index 00000000000..7f3e08bfa67
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/remove-pytest-cache.sh
@@ -0,0 +1 @@
+postFixupHooks+=
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index afba6e15ebd..dd9264514d4 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool }:
+{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }:
 
 stdenv.mkDerivation rec {
   name = "gconf-${version}";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" ];
 
-  buildInputs = [ ORBit2 libxml2 ]
+  buildInputs = [ ORBit2 libxml2 python2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
index 2c99bad8156..72d8e682c86 100644
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ b/pkgs/desktops/xfce/applications/orage.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
-, libnotify, popt, xfce
-}:
+, libnotify, popt, xfce, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
@@ -35,8 +34,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
     xfce.xfce4-panel ];
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache ";
-
   meta = {
     homepage = http://www.xfce.org/projects/;
     description = "A simple calendar application with reminders";
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
index a0856b6a6d7..19ecff29093 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, libnotify
-, gtk , libxfce4util, libxfce4ui, xfconf }:
+, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-notifyd";
@@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ];
+  buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
 
   preFixup = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
     # to be able to run the daemon we need it in PATH
     ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
   '';
diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix
index 5f8cc71de85..0b606ee5fdd 100644
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ b/pkgs/desktops/xfce/core/thunar-build.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool
 , gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
-, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook
+, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
     intltool
     gtk dbus-glib libstartup_notification libnotify libexif pcre udev
     exo libxfce4util xfconf xfce4-panel
+    hicolor-icon-theme
   ];
   # TODO: optionality?
 
   enableParallelBuilding = true;
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   meta = {
     homepage = http://thunar.xfce.org/;
     description = "Xfce file manager";
diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix
index a3b8a619f17..39214ca57b1 100644
--- a/pkgs/desktops/xfce/core/thunar-volman.nix
+++ b/pkgs/desktops/xfce/core/thunar-volman.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, xfconf, udev, libgudev, libnotify }:
+, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   p_name  = "thunar-volman";
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
-      xfconf libnotify
+      xfconf libnotify hicolor-icon-theme
     ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
index c64e8770d25..6399aa3cc20 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
index 236c71c66d5..cb32d567643 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
index 0a309c433e9..07838f8fe7c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,12 +15,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+  buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
 
   enableParallelBuilding = true;
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "CPU Freq load plugin for Xfce panel";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index c5487198f97..8048a857029 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
index a843f0223c4..e82669cc1a3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
index 1b963237c02..6f6f5699b6e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
-, gtk3, libpulseaudio
+, gtk3, libpulseaudio, hicolor-icon-theme
 , withKeybinder ? true, keybinder3
 , withLibnotify ? true, libnotify
 }:
@@ -21,12 +21,10 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ]
+  buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ]
     ++ optional withKeybinder keybinder3
     ++ optional withLibnotify libnotify;
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Adjust the audio volume of the PulseAudio sound system";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 03f062532ea..15cd526d6de 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
-libxfce4ui, libxfce4util, xfce4-panel }:
+libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
@@ -15,12 +15,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
-   xfce4-panel ];
+   xfce4-panel hicolor-icon-theme ];
 
   enableParallelBuilding = true;
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Weather plugin for the Xfce desktop environment";
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index e9c55618c60..ea3a0f08443 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -2,7 +2,7 @@
 , gtk
 , thunar-bare
 , exo, libxfce4util, libxfce4ui
-, xfconf, udev, libnotify
+, xfconf, udev, libnotify, hicolor-icon-theme
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     xfce4-dev-tools
     thunar-bare
     exo gtk libxfce4util libxfce4ui
-    xfconf udev libnotify
+    xfconf udev libnotify hicolor-icon-theme
   ];
 
   preConfigure = ''
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
     pushd $out/libexec/thunar-archive-plugin > /dev/null
     ln -s ./file-roller.tap org.gnome.FileRoller.tap
     popd > /dev/null
-    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 6b9aac4a8cc..b86199c5012 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , gtk
-, thunar-bare, python2
+, thunar-bare, python2, hicolor-icon-theme
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     gtk
-    thunar-bare python2
+    thunar-bare python2 hicolor-icon-theme
   ];
 
   configurePhase = "python2 waf configure --prefix=$out";
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
     python2 waf install
   '';
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index f10c8ec86ff..26bed216acf 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -44,25 +44,30 @@ let
         # BEAM-based languages.
         elixir = elixir_1_6;
 
+        elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
+          inherit rebar erlang;
+          debugInfo = true;
+        };
+
         elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix {
-                       inherit rebar erlang;
-                       debugInfo = true;
-                     };
+          inherit rebar erlang;
+          debugInfo = true;
+        };
 
         elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
-                       inherit rebar erlang;
-                       debugInfo = true;
-                     };
+          inherit rebar erlang;
+          debugInfo = true;
+        };
 
         elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
-                       inherit rebar erlang;
-                       debugInfo = true;
-                     };
+          inherit rebar erlang;
+          debugInfo = true;
+        };
 
         elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
-                       inherit rebar erlang;
-                       debugInfo = true;
-                     };
+          inherit rebar erlang;
+          debugInfo = true;
+        };
 
         lfe = lfe_1_2;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 516268e0efd..3dc6c4197bb 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20180610";
+  version = "20180716";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1qg9a1whmrkrifqrsb9m541cgr3rf1nnkqlv4q7rq30m8bdilvk5";
+    sha256 = "06yc85pbcw1v36j12qwxkk0pbhziglp3zjkv3xza2v68zvyqy6hd";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7671fcdb025..ddd9c27589a 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -29,6 +29,8 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
+assert !enableIntegerSimple -> gmp != null;
+
 let
   inherit (bootPkgs) ghc;
 
@@ -43,8 +45,7 @@ let
     include mk/flavours/\$(BuildFlavour).mk
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = YES
     HADDOCK_DOCS = NO
@@ -127,7 +128,7 @@ stdenv.mkDerivation rec {
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index c24cdeb43bf..79c910e5fd2 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -34,6 +34,8 @@
   deterministicProfiling ? false
 }:
 
+assert !enableIntegerSimple -> gmp != null;
+
 let
   inherit (bootPkgs) ghc;
 
@@ -48,8 +50,7 @@ let
     include mk/flavours/\$(BuildFlavour).mk
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
@@ -160,8 +161,8 @@ stdenv.mkDerivation rec {
     "--datadir=$doc/share/doc/ghc"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform) [
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index c93fb1fd9b2..7be209aa5fa 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -32,6 +32,8 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
+assert !enableIntegerSimple -> gmp != null;
+
 let
   inherit (bootPkgs) ghc;
 
@@ -46,8 +48,7 @@ let
     include mk/flavours/\$(BuildFlavour).mk
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
@@ -149,8 +150,8 @@ stdenv.mkDerivation (rec {
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index ae22e1f1e40..8f0e5215217 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -32,6 +32,8 @@
   ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
+assert !enableIntegerSimple -> gmp != null;
+
 let
   inherit (bootPkgs) ghc;
 
@@ -46,8 +48,7 @@ let
     include mk/flavours/\$(BuildFlavour).mk
     endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
     Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
     CrossCompilePrefix = ${targetPrefix}
@@ -141,8 +142,8 @@ stdenv.mkDerivation (rec {
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 75037f6a07d..9651dbb72f4 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
@@ -16,25 +16,28 @@ let
   compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53";
   clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m";
 
-  # Add man output without introducing extra dependencies.
-  overrideManOutput = drv:
-    let drv-manpages = drv.override { enableManpages = true; }; in
-    drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
   tools = stdenv.lib.makeExtensible (tools: let
-    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
   in {
 
-    llvm = overrideManOutput (callPackage ./llvm.nix {
+    llvm = callPackage ./llvm.nix {
       inherit compiler-rt_src;
-    });
-    clang-unwrapped = overrideManOutput (callPackage ./clang {
+    };
+    clang-unwrapped = callPackage ./clang {
       inherit clang-tools-extra_src;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
     });
 
     libclang = tools.clang-unwrapped.lib;
-    llvm-manpages = lowPrio tools.llvm.man;
-    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
@@ -54,7 +57,7 @@ let
   });
 
   libraries = stdenv.lib.makeExtensible (libraries: let
-    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
   in {
 
     stdenv = overrideCC stdenv buildLlvmTools.clang;
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 8cfeb02225a..1b186c730c0 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -13,7 +13,7 @@
 , compiler-rt_src
 , debugVersion ? false
 , enableManpages ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? !enableManpages
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 00b0083108b..38d2b0d461d 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
@@ -15,13 +15,8 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
 
-  # Add man output without introducing extra dependencies.
-  overrideManOutput = drv:
-    let drv-manpages = drv.override { enableManpages = true; }; in
-    drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
   tools = stdenv.lib.makeExtensible (tools: let
-    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
       mkdir "$rsrc"
@@ -33,15 +28,23 @@ let
     '';
   in {
 
-    llvm = overrideManOutput (callPackage ./llvm.nix { });
+    llvm = callPackage ./llvm.nix { };
 
-    clang-unwrapped = overrideManOutput (callPackage ./clang {
+    clang-unwrapped = callPackage ./clang {
       inherit clang-tools-extra_src;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
     });
 
     libclang = tools.clang-unwrapped.lib;
-    llvm-manpages = lowPrio tools.llvm.man;
-    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
@@ -70,7 +73,7 @@ let
   });
 
   libraries = stdenv.lib.makeExtensible (libraries: let
-    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix {};
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 3a6dea806f3..760969f3469 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -12,7 +12,7 @@
 , libcxxabi
 , debugVersion ? false
 , enableManpages ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? !enableManpages
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 141daa88dcf..831e4b65344 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,5 +1,5 @@
-{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
@@ -15,13 +15,8 @@ let
 
   clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
 
-  # Add man output without introducing extra dependencies.
-  overrideManOutput = drv:
-    let drv-manpages = drv.override { enableManpages = true; }; in
-    drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
-
   tools = stdenv.lib.makeExtensible (tools: let
-    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
     mkExtraBuildCommands = cc: ''
       rsrc="$out/resource-root"
       mkdir "$rsrc"
@@ -33,15 +28,23 @@ let
     '';
   in {
 
-    llvm = overrideManOutput (callPackage ./llvm.nix { });
+    llvm = callPackage ./llvm.nix { };
 
-    clang-unwrapped = overrideManOutput (callPackage ./clang {
+    clang-unwrapped = callPackage ./clang {
       inherit clang-tools-extra_src;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
     });
 
     libclang = tools.clang-unwrapped.lib;
-    llvm-manpages = lowPrio tools.llvm.man;
-    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
@@ -70,7 +73,7 @@ let
   });
 
   libraries = stdenv.lib.makeExtensible (libraries: let
-    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
   in {
 
     compiler-rt = callPackage ./compiler-rt.nix {};
diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix
index 5a3e75e648d..19b9626f4e8 100644
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "07";
-  patch_version = "0+rc1";
-  sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8";
+  patch_version = "0";
+  sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl";
 
   # If the executable is stripped it does not work
   dontStrip = true;
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 36dc8b6f147..be816b37455 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.24.0";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1yq82jj0c9nxrx4vxcb3s6yr154kaj2a3wrk12m6fm3dscsqsqq1";
+    sha256 = "0g32bccbbwad9894zv2wjimbp8bpcj4ldddfdm4p2n8vcw6vi5y3";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 766a10c9579..795c177bc80 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -3,15 +3,15 @@
 let param =
   {
     "8.6" = {
-      version = "20171214";
-      rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
-      sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+      version = "20180709";
+      rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
+      sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
     };
 
     "8.7" = {
-      version = "20171214";
-      rev = "babf9c013506da1dbd67171e4a3ae87fdb7e9d00";
-      sha256 = "16fsf4cggx9s9fkijnpi4g614nmdb2yx7inzqqn070f8p959qcrd";
+      version = "20180709";
+      rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
+      sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
     };
 
   }."${coq.coq-version}"
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index bd047da4c91..bb9aaeb00cf 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -2,6 +2,7 @@
 , removeReferencesTo, fetchFromGitHub }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+, shellHook ? ""
 
 # We want parallel builds by default
 , enableParallelBuilding ? true
@@ -198,7 +199,7 @@ go.stdenv.mkDerivation (
   ''
   ) goPath) + ''
     export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
-  '';
+  '' + shellHook;
 
   disallowedReferences = lib.optional (!allowGoReference) go
     ++ lib.optional (!dontRenameImports) govers;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a9f1ac7cb88..3c8f94860b4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -249,14 +249,6 @@ self: super: {
   # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
   #   This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
   hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
-    patches = old.patches or [] ++ [
-      # should land in hnix-5.2
-      (pkgs.fetchpatch {
-        url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
-        sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
-        name = "disable-hpack-test-by-default.patch";
-      })
-    ];
     testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
   })));
 
@@ -506,11 +498,20 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
+  # Missing file in source distribution:
+  # - https://github.com/karun012/doctest-discover/issues/22
+  # - https://github.com/karun012/doctest-discover/issues/23
+  #
+  # When these are fixed the following needs to be enabled again:
+  #
+  # # Depends on itself for testing
+  # doctest-discover = addBuildTool super.doctest-discover
+  #   (if pkgs.buildPlatform != pkgs.hostPlatform
+  #    then self.buildHaskellPackages.doctest-discover
+  #    else dontCheck super.doctest-discover);
+  doctest-discover = dontCheck super.doctest-discover;
+
   # Depends on itself for testing
-  doctest-discover = addBuildTool super.doctest-discover
-    (if pkgs.buildPlatform != pkgs.hostPlatform
-     then self.buildHaskellPackages.doctest-discover
-     else dontCheck super.doctest-discover);
   tasty-discover = addBuildTool super.tasty-discover
     (if pkgs.buildPlatform != pkgs.hostPlatform
      then self.buildHaskellPackages.tasty-discover
@@ -728,9 +729,6 @@ self: super: {
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
-  # broken test suite
-  servant-server = dontCheck super.servant-server;
-
   # build servant docs from the repository
   servant =
     let
@@ -755,9 +753,6 @@ self: super: {
       '';
     });
 
-  # Glob == 0.7.x
-  servant-auth = doJailbreak super.servant-auth;
-
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
@@ -826,9 +821,6 @@ self: super: {
   # https://github.com/fizruk/http-api-data/issues/49
   http-api-data = dontCheck super.http-api-data;
 
-  # https://github.com/snoyberg/yaml/issues/106
-  yaml = disableCabalFlag super.yaml "system-libyaml";
-
   # https://github.com/diagrams/diagrams-lib/issues/288
   diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
 
@@ -1070,6 +1062,9 @@ self: super: {
   # Test suite depends on cabal-install
   doctest = dontCheck super.doctest;
 
+  # https://github.com/haskell-servant/servant-auth/issues/113
+  servant-auth-client = dontCheck super.servant-auth-client;
+
   # Over-specified constraint on X11 ==1.8.*.
   xmonad = doJailbreak super.xmonad;
 
@@ -1119,4 +1114,8 @@ self: super: {
     url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch";
     sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
   });
+
+  # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
+  blank-canvas = dontCheck super.blank-canvas;
+  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 65886a3960b..4239af45d00 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.1
+  # LTS Haskell 12.2
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -68,10 +68,10 @@ default-package-overrides:
   - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.7
   - aeson-qq ==0.8.2
-  - aeson-typescript ==0.1.0.6
+  - aeson-typescript ==0.1.1.0
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
-  - Agda ==2.5.4
+  - Agda ==2.5.4.1
   - al ==0.1.4.2
   - alarmclock ==0.5.0.2
   - alerts ==0.1.0.0
@@ -536,8 +536,8 @@ default-package-overrides:
   - data-inttrie ==0.1.4
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
-  - data-msgpack ==0.0.11
-  - data-msgpack-types ==0.0.1
+  - data-msgpack ==0.0.12
+  - data-msgpack-types ==0.0.2
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
   - data-ref ==0.0.1.1
@@ -666,7 +666,7 @@ default-package-overrides:
   - equivalence ==0.3.2
   - erf ==2.0.0.0
   - errors ==2.3.0
-  - errors-ext ==0.4.1
+  - errors-ext ==0.4.2
   - error-util ==0.0.1.2
   - ersatz ==0.4.3
   - etc ==0.4.0.3
@@ -1010,12 +1010,12 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4.14
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.5.4
+  - hspec ==2.5.5
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.0
-  - hspec-core ==2.5.4
-  - hspec-discover ==2.5.4
+  - hspec-core ==2.5.5
+  - hspec-discover ==2.5.5
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.4
@@ -1067,7 +1067,7 @@ default-package-overrides:
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
-  - hw-hedgehog ==0.1.0.1
+  - hw-hedgehog ==0.1.0.2
   - hw-hspec-hedgehog ==0.1.0.5
   - hw-int ==0.0.0.3
   - hw-ip ==0.1.0.0
@@ -1099,7 +1099,7 @@ default-package-overrides:
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - iff ==0.0.6
-  - ihaskell ==0.9.0.3
+  - ihaskell ==0.9.1.0
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
@@ -1142,7 +1142,7 @@ default-package-overrides:
   - ip6addr ==1.0.0
   - iproute ==1.7.5
   - IPv6Addr ==1.1.0
-  - ipython-kernel ==0.9.0.2
+  - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
   - irc-client ==1.1.0.4
   - irc-conduit ==0.3.0.1
@@ -1444,7 +1444,7 @@ default-package-overrides:
   - NoHoed ==0.1.1
   - nonce ==1.0.7
   - nondeterminism ==1.4
-  - non-empty ==0.3
+  - non-empty ==0.3.0.1
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
   - nsis ==0.3.2
@@ -1712,8 +1712,8 @@ default-package-overrides:
   - regex-tdfa ==1.2.3.1
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.12.0.1
-  - relational-query-HDBC ==0.7.0.1
+  - relational-query ==0.12.1.0
+  - relational-query-HDBC ==0.7.1.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
   - renderable ==0.2.0.1
@@ -1741,7 +1741,7 @@ default-package-overrides:
   - roles ==0.2.0.0
   - rot13 ==0.2.0.1
   - RSA ==2.3.0
-  - rss-conduit ==0.4.2.1
+  - rss-conduit ==0.4.2.2
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.5.0.0
@@ -1824,7 +1824,7 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
-  - serverless-haskell ==0.6.2
+  - serverless-haskell ==0.6.3
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - servius ==1.2.1.0
@@ -1851,7 +1851,7 @@ default-package-overrides:
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simplest-sqlite ==0.1.0.0
-  - simple-vec3 ==0.4.0.7
+  - simple-vec3 ==0.4.0.8
   - since ==0.0.0
   - singleton-bool ==0.1.4
   - singleton-nats ==0.4.1
@@ -1950,7 +1950,7 @@ default-package-overrides:
   - strive ==5.0.6
   - structs ==0.1.1
   - stylish-haskell ==0.9.2.0
-  - summoner ==1.0.4
+  - summoner ==1.0.5
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
@@ -2304,9 +2304,9 @@ default-package-overrides:
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.8.32
-  - yeshql ==4.1.0.0
-  - yeshql-core ==4.1.0.0
-  - yeshql-hdbc ==4.1.0.0
+  - yeshql ==4.1.0.1
+  - yeshql-core ==4.1.0.1
+  - yeshql-hdbc ==4.1.0.1
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.4.1
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 4e62d470506..a6cfef6f45f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -309,6 +309,9 @@ self: super: builtins.intersectAttrs super {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
+  # https://github.com/snoyberg/yaml/issues/106
+  yaml = disableCabalFlag super.yaml "system-libyaml";
+
   # The cabal files for these libraries do not list the required system dependencies.
   miniball = overrideCabal super.miniball (drv: {
     librarySystemDepends = [ pkgs.miniball ];
@@ -471,6 +474,9 @@ self: super: builtins.intersectAttrs super {
     '';
   });
 
+  # https://github.com/plow-technologies/servant-streaming/issues/12
+  servant-streaming-server = dontCheck super.servant-streaming-server;
+
   # tests run executable, relying on PATH
   # without this, tests fail with "Couldn't launch intero process"
   intero = overrideCabal super.intero (drv: {
@@ -499,9 +505,4 @@ self: super: builtins.intersectAttrs super {
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
   }));
-
-  # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
-  blank-canvas = dontCheck super.blank-canvas;
-  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
-
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2d0d3be2f58..b5da00754b5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -719,49 +719,6 @@ self: {
     ({ mkDerivation, alex, array, async, base, binary, blaze-html
      , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
      , directory, EdisonCore, edit-distance, emacs, equivalence
-     , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables
-     , haskeline, ieee754, mtl, murmur-hash, pretty, process, regex-tdfa
-     , stm, strict, template-haskell, text, time, transformers
-     , unordered-containers, uri-encode, zlib
-     }:
-     mkDerivation {
-       pname = "Agda";
-       version = "2.5.4";
-       sha256 = "02cyq1wpnllzcwdb45gk3hq7hha2090ay6m16qg7fq9467ip22dl";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath process ];
-       libraryHaskellDepends = [
-         array async base binary blaze-html boxes bytestring containers
-         data-hash deepseq directory EdisonCore edit-distance equivalence
-         filepath geniplate-mirror gitrev hashable hashtables haskeline
-         ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
-         template-haskell text time transformers unordered-containers
-         uri-encode zlib
-       ];
-       libraryToolDepends = [ alex cpphs happy ];
-       executableHaskellDepends = [ base directory filepath process ];
-       executableToolDepends = [ emacs ];
-       postInstall = ''
-         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-         for f in "''${files[@]}" ; do
-           $out/bin/agda $f
-         done
-         for f in "''${files[@]}" ; do
-           $out/bin/agda -c --no-main $f
-         done
-         $out/bin/agda-mode compile
-       '';
-       description = "A dependently typed functional programming language and proof assistant";
-       license = "unknown";
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
-     }) {inherit (pkgs) emacs;};
-
-  "Agda_2_5_4_1" = callPackage
-    ({ mkDerivation, alex, array, async, base, binary, blaze-html
-     , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
-     , directory, EdisonCore, edit-distance, emacs, equivalence
      , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
      , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
      , regex-tdfa, stm, strict, template-haskell, text, time
@@ -798,7 +755,6 @@ self: {
        '';
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
@@ -11789,8 +11745,8 @@ self: {
     ({ mkDerivation, base, bytestring, hidapi, mtl }:
      mkDerivation {
        pname = "MBot";
-       version = "0.2.4.0";
-       sha256 = "1jzjf1p1ld9xdxqb9jf32nyhzmp29mirpinz24s8blwpscia5v56";
+       version = "0.2.4.1";
+       sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
@@ -22076,29 +22032,6 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-typescript";
-       version = "0.1.0.6";
-       sha256 = "11q165g6yvd87ahbfvxdpr6w61l0y9znv1x5jmznmj1c9m9s36id";
-       libraryHaskellDepends = [
-         aeson base containers interpolate mtl template-haskell text
-         th-abstraction unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath hspec
-         interpolate mtl process template-haskell temporary text
-         th-abstraction unordered-containers
-       ];
-       description = "Generate TypeScript definition files from your ADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-typescript_0_1_1_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, interpolate, mtl, process, template-haskell
-     , temporary, text, th-abstraction, unordered-containers
-     }:
-     mkDerivation {
-       pname = "aeson-typescript";
        version = "0.1.1.0";
        sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp";
        libraryHaskellDepends = [
@@ -29129,19 +29062,19 @@ self: {
 
   "async-combinators" = callPackage
     ({ mkDerivation, async, base, hedgehog, HUnit, safe-exceptions
-     , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, universum
+     , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, text
      , unliftio-core
      }:
      mkDerivation {
        pname = "async-combinators";
-       version = "0.0.0";
-       sha256 = "1rj9fahpch74ygkx3lv4282lb775cklxi3c5wys544binnya9v7b";
+       version = "0.0.1";
+       sha256 = "0zacn4iryzxwll158dq1xcaww28hlph1jgqrf4vqyfigcvrpf4gv";
        libraryHaskellDepends = [
-         async base safe-exceptions universum unliftio-core
+         async base safe-exceptions text unliftio-core
        ];
        testHaskellDepends = [
          base hedgehog HUnit safe-exceptions tasty tasty-discover
-         tasty-hedgehog tasty-hunit universum
+         tasty-hedgehog tasty-hunit
        ];
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
@@ -30740,6 +30673,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_3_3_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+     , bytestring, containers, data-binary-ieee754, directory, entropy
+     , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+     , QuickCheck, scientific, semigroups, tagged, template-haskell
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.3.3.0";
+       sha256 = "0ccf39djb9xac2gh85rdjiszas6308rxzgy3p61i9vc76hmjjwk0";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+         semigroups tagged template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         directory entropy extra fail hashable hspec lens lens-aeson mtl
+         pure-zlib QuickCheck scientific semigroups tagged template-haskell
+         text transformers unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -54042,10 +54002,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptoids";
-       version = "0.5.0.0";
-       sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2";
-       revision = "4";
-       editedCabalFile = "1lghn17a367cvljsc8kddn11qd30nz6a6dl4128xbc6p0bf41pzj";
+       version = "0.5.1.0";
+       sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466";
        libraryHaskellDepends = [
          base binary bytestring cryptoids-class cryptoids-types cryptonite
          directory exceptions filepath memory
@@ -56901,32 +56859,6 @@ self: {
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.11";
-       sha256 = "11dq5s1s6zcjfa7n464amwiz4sfrkqa7bb5x1rfqiivxc6bgq119";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring data-binary-ieee754 data-msgpack-types text
-       ];
-       executableHaskellDepends = [ base bytestring groom ];
-       testHaskellDepends = [
-         base bytestring containers data-msgpack-types hashable hspec
-         QuickCheck text unordered-containers vector void
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq QuickCheck
-       ];
-       description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-msgpack_0_0_12" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable
-     , hspec, QuickCheck, text, unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "data-msgpack";
        version = "0.0.12";
        sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw";
        isLibrary = true;
@@ -56944,27 +56876,10 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-msgpack-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
-     , QuickCheck, text, unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "data-msgpack-types";
-       version = "0.0.1";
-       sha256 = "1658jhg09gsfb0ajcdfx4k78pwd19inbffg1qr0a4hwn12gi77sj";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq hashable QuickCheck text
-         unordered-containers vector void
-       ];
-       description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-msgpack-types_0_0_2" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , hspec, QuickCheck, text, unordered-containers, vector, void
      }:
      mkDerivation {
@@ -56978,7 +56893,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-named" = callPackage
@@ -59062,8 +58976,8 @@ self: {
     ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.6.3";
-       sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq";
+       version = "0.6.5.1";
+       sha256 = "1awb8g145jknywiyclq3jhpq94lf0c19n4ns7p4lvgx7fs4xyr9c";
        libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -60283,6 +60197,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-json_1_2_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
+     , insert-ordered-containers, optparse-applicative, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "dhall-json";
+       version = "1.2.2";
+       sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base dhall insert-ordered-containers optparse-applicative
+         text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring dhall optparse-applicative text
+         yaml
+       ];
+       description = "Compile Dhall to JSON or YAML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dhall-lex" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
      , hspec, hspec-dirstream, scientific
@@ -61429,20 +61367,20 @@ self: {
 
   "digestive-functors" = callPackage
     ({ mkDerivation, base, bytestring, containers, HUnit, mtl
-     , old-locale, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time
+     , old-locale, QuickCheck, semigroups, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
      }:
      mkDerivation {
        pname = "digestive-functors";
-       version = "0.8.3.0";
-       sha256 = "00nnhjd85fwav95k8f2pdsfk96rqmg7pc54zysqva3h2n5drhmp6";
+       version = "0.8.4.0";
+       sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0";
        libraryHaskellDepends = [
-         base bytestring containers mtl old-locale text time
+         base bytestring containers mtl old-locale semigroups text time
        ];
        testHaskellDepends = [
          base bytestring containers HUnit mtl old-locale QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time
+         semigroups test-framework test-framework-hunit
+         test-framework-quickcheck2 text time
        ];
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
@@ -61509,8 +61447,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-heist";
-       version = "0.8.8.0";
-       sha256 = "0i9aqabrlk4hj6l3dbc0fl1vwq6bpdwfgc03m2xl4lwlhj14j56w";
+       version = "0.8.8.1";
+       sha256 = "1gfh94c52g6vhny2j7hf61w3gp2vmh3gp9bssmmx6mklwk3lzg3y";
        libraryHaskellDepends = [
          base blaze-builder digestive-functors heist map-syntax mtl text
          xmlhtml
@@ -61570,8 +61508,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-snap";
-       version = "0.7.0.0";
-       sha256 = "17vlrzsb8gkzm8rbk112yf9l4b0c982rwrfzkk4v0filp2xfy2i4";
+       version = "0.7.0.1";
+       sha256 = "14i42q6ngajzg01zl2mp38800j3bzn4389s3kgbpg0am2mn0458z";
        libraryHaskellDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
@@ -63011,8 +62949,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-opensuse";
-       version = "1.1.0";
-       sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2";
+       version = "1.1.1";
+       sha256 = "1drjlcakv48djnqyrl50c6l974zrxm1gq3z8cx58xndfb2j0hzq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63716,6 +63654,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "doctest-discover_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , filepath
+     }:
+     mkDerivation {
+       pname = "doctest-discover";
+       version = "0.2.0.0";
+       sha256 = "1j4yqkb5jvvm9g2xpnm6gy4brb725cn3hzm7cv3yylkyhd8allx9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
+       doHaddock = false;
+       description = "Easy way to run doctests via cabal";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover-configurator" = callPackage
     ({ mkDerivation, base, bytestring, configurator, directory, doctest
      , filepath
@@ -68399,8 +68360,8 @@ self: {
      }:
      mkDerivation {
        pname = "erlang";
-       version = "0.2.2";
-       sha256 = "0wcbygaszniyw0xalgcx643pcdiwg94y5nayb3mb07v267hq0849";
+       version = "0.2.3";
+       sha256 = "1sh4ajq819rki2nc1l6a9kq05z74rnpjmi50grwyrr7652b8wwga";
        libraryHaskellDepends = [
          base binary bytestring directory filepath MissingH network random
        ];
@@ -68608,24 +68569,6 @@ self: {
      }) {};
 
   "errors-ext" = callPackage
-    ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
-     , mtl, transformers
-     }:
-     mkDerivation {
-       pname = "errors-ext";
-       version = "0.4.1";
-       sha256 = "1xly8pgkbqkm4mb1zg9bga08gx5fj4nrmidzj5p8anqdksq7ib5h";
-       libraryHaskellDepends = [
-         base errors exceptions monad-control mtl transformers
-       ];
-       testHaskellDepends = [
-         base errors exceptions HUnit monad-control mtl transformers
-       ];
-       description = "`bracket`-like functions for `ExceptT` over `IO` monad";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "errors-ext_0_4_2" = callPackage
     ({ mkDerivation, base, binary-ext, bytestring, conduit, errors
      , exceptions, HUnit, monad-control, monad-loops, mtl, transformers
      }:
@@ -68642,7 +68585,6 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersaconcat" = callPackage
@@ -68820,8 +68762,8 @@ self: {
      }:
      mkDerivation {
        pname = "espial";
-       version = "0.0.3";
-       sha256 = "1j6q97xlk1m1l80qb41jmrqx1mawmrwaq8pby2b4mvmz5ighxx4i";
+       version = "0.0.4";
+       sha256 = "15v0apj7mfb61jmbl806ak92h5a8qbp8cl05g07qnrp8hmh1g9fp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97138,6 +97080,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql_1_3_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, data-default-class, dlist, hashable, hashtables
+     , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
+     , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "1.3.0.3";
+       sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras data-default-class dlist
+         hashable hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors text text-builder transformers vector
+       ];
+       testHaskellDepends = [
+         bug data-default-class QuickCheck quickcheck-instances rebase
+         rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -108512,7 +108483,7 @@ self: {
        pname = "hslua";
        version = "0.9.5.2";
        sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
-       configureFlags = [ "-fsystem-lua" ];
+       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
        ];
@@ -108932,29 +108903,6 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.4";
-       sha256 = "19shs06srgq4j3mm0lz09yxqn7hzq4pnyl32wmi9nf2a7s3xwlm8";
-       libraryHaskellDepends = [
-         base call-stack hspec-core hspec-discover hspec-expectations HUnit
-         QuickCheck transformers
-       ];
-       testHaskellDepends = [
-         base call-stack directory hspec-core hspec-discover
-         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec_2_5_5" = callPackage
-    ({ mkDerivation, base, call-stack, directory, hspec-core
-     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
-     , stringbuilder, transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
        version = "2.5.5";
        sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
        libraryHaskellDepends = [
@@ -108969,7 +108917,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -109049,32 +108996,6 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.4";
-       sha256 = "1r9h59nqdl3bx4ka1f7fwp9b6724vs1260aa0a9xn18xkabkm72q";
-       libraryHaskellDepends = [
-         ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv stm tf-random transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array base call-stack clock deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently stm temporary tf-random
-         transformers
-       ];
-       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-core_2_5_5" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, stm, temporary, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
        version = "2.5.5";
        sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
        libraryHaskellDepends = [
@@ -109091,7 +109012,6 @@ self: {
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-dirstream" = callPackage
@@ -109136,24 +109056,6 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.4";
-       sha256 = "1wzf6gf7qfq0n045gq4rpr5vs5g6rnwd3i6c4fmaza0k7pxd9znl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath hspec-meta QuickCheck
-       ];
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_5_5" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
-     }:
-     mkDerivation {
-       pname = "hspec-discover";
        version = "2.5.5";
        sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
        isLibrary = true;
@@ -109165,7 +109067,6 @@ self: {
        ];
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
@@ -112959,27 +112860,12 @@ self: {
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
        pname = "hw-hedgehog";
-       version = "0.1.0.1";
-       sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
-       revision = "1";
-       editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz";
-       libraryHaskellDepends = [ base hedgehog vector ];
-       testHaskellDepends = [ base ];
-       description = "Extra hedgehog functionality";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-hedgehog_0_1_0_2" = callPackage
-    ({ mkDerivation, base, hedgehog, vector }:
-     mkDerivation {
-       pname = "hw-hedgehog";
        version = "0.1.0.2";
        sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby";
        libraryHaskellDepends = [ base hedgehog vector ];
        testHaskellDepends = [ base ];
        description = "Extra hedgehog functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
@@ -115452,41 +115338,6 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.9.0.3";
-       sha256 = "13cblc7wy92gbsvvbmxmp1r9c3fkmzl61adan8v9zxqbgw1w284p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cereal cmdargs containers
-         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
-         haskell-src-exts hlint http-client http-client-tls ipython-kernel
-         mtl parsec process random shelly split stm strict system-argv0 text
-         transformers unix unordered-containers utf8-string uuid vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory ghc ipython-kernel
-         process strict text transformers unix
-       ];
-       testHaskellDepends = [
-         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
-         shelly text transformers
-       ];
-       description = "A Haskell backend kernel for the IPython project";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ihaskell_0_9_1_0" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
-     , cmdargs, containers, directory, filepath, ghc, ghc-boot
-     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
-     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
-     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
-     , split, stm, strict, system-argv0, text, transformers, unix
-     , unordered-containers, utf8-string, uuid, vector
-     }:
-     mkDerivation {
-       pname = "ihaskell";
        version = "0.9.1.0";
        sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain";
        isLibrary = true;
@@ -115509,7 +115360,6 @@ self: {
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -116978,6 +116828,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "influxdb_1_6_0_7" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, clock, containers, doctest, foldl, http-client
+     , http-types, lens, network, optional-args, QuickCheck, scientific
+     , tagged, template-haskell, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "influxdb";
+       version = "1.6.0.7";
+       sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific tagged text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       description = "Haskell client library for InfluxDB";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "informative" = callPackage
     ({ mkDerivation, base, containers, csv, highlighting-kate
      , http-conduit, monad-logger, pandoc, persistent
@@ -117411,6 +117286,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "instance-map" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec
+     , mtl, template-haskell
+     }:
+     mkDerivation {
+       pname = "instance-map";
+       version = "0.1.0.0";
+       sha256 = "03mzwprhi98jmsr5qg3zm71rg01nbkxf53qqqfjrnar3qw3drk16";
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers hspec mtl template-haskell
+       ];
+       description = "Template haskell utilities for helping with deserialization etc. of existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "instant-aeson" = callPackage
     ({ mkDerivation, aeson, base, instant-generics, tasty
      , tasty-quickcheck
@@ -118756,27 +118647,6 @@ self: {
 
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, process, SHA, temporary, text
-     , transformers, unordered-containers, uuid, zeromq4-haskell
-     }:
-     mkDerivation {
-       pname = "ipython-kernel";
-       version = "0.9.0.2";
-       sha256 = "01l22myk73igczzjj4b239brp80b3pfamw9w67lw4l4w6n7lc8sr";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cereal containers directory filepath mtl
-         process SHA temporary text transformers unordered-containers uuid
-         zeromq4-haskell
-       ];
-       description = "A library for creating kernels for IPython frontends";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ipython-kernel_0_9_1_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , cryptonite, directory, filepath, memory, mtl, process, temporary
      , text, transformers, unordered-containers, uuid, zeromq4-haskell
      }:
@@ -118794,7 +118664,6 @@ self: {
        ];
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc" = callPackage
@@ -128852,19 +128721,19 @@ self: {
 
   "life-sync" = callPackage
     ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
-     , containers, filepath, fmt, hedgehog, microlens-platform
-     , optparse-applicative, path, path-io, process, tasty
-     , tasty-discover, tasty-hedgehog, text, tomland, universum
+     , containers, exceptions, filepath, fmt, hedgehog
+     , microlens-platform, optparse-applicative, path, path-io, process
+     , relude, tasty, tasty-discover, tasty-hedgehog, text, tomland
      }:
      mkDerivation {
        pname = "life-sync";
-       version = "1.0";
-       sha256 = "04w83c96zhjl52j5iyy3149gpj3m02jfyfvbvvgg34xxqm0vwzha";
+       version = "1.0.1";
+       sha256 = "1p7vnbk6xsa2963wc77cjjc5bbnrswzh27nw1zra09405yd21yf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base-noprelude bytestring containers fmt
-         microlens-platform path path-io process text tomland universum
+         ansi-terminal base-noprelude bytestring containers exceptions fmt
+         microlens-platform path path-io process relude text tomland
        ];
        executableHaskellDepends = [
          base-noprelude containers optparse-applicative path
@@ -147081,22 +146950,6 @@ self: {
      }:
      mkDerivation {
        pname = "non-empty";
-       version = "0.3";
-       sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p";
-       revision = "1";
-       editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh";
-       libraryHaskellDepends = [
-         base containers deepseq QuickCheck utility-ht
-       ];
-       description = "List-like structures with static restrictions on the number of elements";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "non-empty_0_3_0_1" = callPackage
-    ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
-     }:
-     mkDerivation {
-       pname = "non-empty";
        version = "0.3.0.1";
        sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z";
        libraryHaskellDepends = [
@@ -147104,7 +146957,6 @@ self: {
        ];
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -149299,10 +149151,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.6.7000.0";
-       sha256 = "11wj57k7fswln9is47r09yj7h60hbqa6x0lnh6cg2bmg9ynnvmxk";
-       revision = "1";
-       editedCabalFile = "1g2asrmd4aaw61dcprs9mih1j065q9xipnrhkxablqwcpr8pzz21";
+       version = "0.6.7001.0";
+       sha256 = "0r1hy1p8lcvhqh7p0199dipl7791sbppihl8v1k1vazbr2nkj0l9";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -156903,8 +156753,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-async";
-       version = "0.1.2";
-       sha256 = "0gfqjppg660i07y186khqb3wqgl5fchbmmsz1zaaqn5rnp7yj3pc";
+       version = "0.1.3";
+       sha256 = "12gsbfsknqpmf96nd3lh702bb1564wggr7niyqyy55k91wk2v25m";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
@@ -157306,26 +157156,25 @@ self: {
   "pipes-files" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, doctest
      , exceptions, filepath, free, hierarchy, hspec, hspec-expectations
-     , mmorph, monad-control, mtl, pipes, pipes-safe, posix-paths
-     , process, regex-posix, semigroups, text, time, transformers
-     , transformers-base, transformers-compat, unix, unix-compat
+     , logict, mmorph, monad-control, mtl, pipes, pipes-safe
+     , posix-paths, process, regex-posix, semigroups, text, time
+     , transformers, transformers-base, transformers-compat, unix
+     , unix-compat
      }:
      mkDerivation {
        pname = "pipes-files";
-       version = "0.1.2";
-       sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw";
-       revision = "1";
-       editedCabalFile = "0bg0ji5w17kx8qnba0aisvyf6md5qf5846gy9kdh8k3vh410sc2r";
+       version = "0.1.3";
+       sha256 = "12y40lfpzcjmqq7cqs5g999ksn4mk3w0ybw0whhv15bflsykqw97";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
-         hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
-         regex-posix semigroups text time transformers transformers-base
-         transformers-compat unix unix-compat
+         hierarchy logict mmorph monad-control mtl pipes pipes-safe
+         posix-paths regex-posix semigroups text time transformers
+         transformers-base transformers-compat unix unix-compat
        ];
        testHaskellDepends = [
          base bytestring directory doctest filepath hierarchy hspec
-         hspec-expectations mtl pipes pipes-safe process semigroups text
-         transformers unix
+         hspec-expectations logict mtl pipes pipes-safe process semigroups
+         text transformers unix
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -163071,16 +162920,15 @@ self: {
 
   "prometheus" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , http-client, http-types, lens, proto-lens, proto-lens-protoc
-     , text, transformers, wai, warp, wreq
+     , http-client, http-types, text, transformers, wai, warp, wreq
      }:
      mkDerivation {
        pname = "prometheus";
-       version = "0.5.0";
-       sha256 = "0bfm9frngj0lfpbmrxb0qg5x7bx447wyc8x8x79ah0r9l1l1bfsb";
+       version = "2.0.0";
+       sha256 = "15cp3r42kj3v6a6d67xr9ns69mz96zgh4wsa1jch34idwsxz6wxf";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers http-client http-types
-         lens proto-lens proto-lens-protoc text transformers wai warp wreq
+         text transformers wai warp wreq
        ];
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
@@ -164802,8 +164650,8 @@ self: {
      }:
      mkDerivation {
        pname = "pushme";
-       version = "2.1.1";
-       sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw";
+       version = "2.1.3";
+       sha256 = "13rc83fqbizcq1pvvmpd90cy5664p21hjg1aw5bjqw19l2g3c153";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -165866,8 +165714,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.13";
-       sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs";
+       version = "0.4.14";
+       sha256 = "010pbdv5dyyf2qkc41gbb86x94m8y1jlw9fa9k99jnw79c8bv3d9";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -168156,28 +168004,25 @@ self: {
 
   "rdf4h" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , criterion, deepseq, directory, hashable, hgal, HTTP, HUnit, hxt
-     , mtl, network, network-uri, parsec, parsers, QuickCheck, safe
-     , tasty, tasty-hunit, tasty-quickcheck, text, text-binary
-     , unordered-containers, utf8-string
+     , criterion, deepseq, directory, filepath, hashable, hgal, HTTP
+     , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "3.0.4";
-       sha256 = "0jci2d6n157y22ypsjb7kf4pknd53jjh2xj0i6qjsdh13qpwb7xq";
+       version = "3.1.0";
+       sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base binary bytestring containers deepseq directory
-         hashable hgal HTTP hxt mtl network network-uri parsec parsers text
-         text-binary unordered-containers utf8-string
-       ];
-       executableHaskellDepends = [
-         base containers network network-uri text
+         attoparsec base binary bytestring containers deepseq filepath
+         hashable hgal HTTP hxt mtl network-uri parsec parsers text
+         unordered-containers
        ];
+       executableHaskellDepends = [ base containers text ];
        testHaskellDepends = [
-         base bytestring containers directory HUnit network network-uri
-         QuickCheck safe tasty tasty-hunit tasty-quickcheck text
+         base containers directory filepath HUnit QuickCheck safe tasty
+         tasty-hunit tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A library for RDF processing in Haskell";
@@ -170864,28 +170709,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.12.0.1";
-       sha256 = "0njmp3209499qvm30dy4k9gc3fpnf00bkkd42f8cif9gi5fhbwhz";
-       libraryHaskellDepends = [
-         array base bytestring containers dlist names-th persistable-record
-         product-isomorphic sql-words template-haskell text th-reify-compat
-         time time-locale-compat transformers
-       ];
-       testHaskellDepends = [
-         base containers product-isomorphic quickcheck-simple transformers
-       ];
-       description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query_0_12_1_0" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, product-isomorphic
-     , quickcheck-simple, sql-words, template-haskell, text
-     , th-reify-compat, time, time-locale-compat, transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
        version = "0.12.1.0";
        sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k";
        libraryHaskellDepends = [
@@ -170898,7 +170721,6 @@ self: {
        ];
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -170910,30 +170732,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.1";
-       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
-       libraryHaskellDepends = [
-         base containers convertible dlist HDBC HDBC-session names-th
-         persistable-record product-isomorphic relational-query
-         relational-schemas sql-words template-haskell th-data-compat
-         transformers
-       ];
-       testHaskellDepends = [
-         base convertible HDBC QuickCheck quickcheck-simple
-       ];
-       description = "HDBC instance of relational-query and typed query interface for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query-HDBC_0_7_1_1" = callPackage
-    ({ mkDerivation, base, containers, convertible, dlist, HDBC
-     , HDBC-session, names-th, persistable-record, product-isomorphic
-     , QuickCheck, quickcheck-simple, relational-query
-     , relational-schemas, sql-words, template-haskell, th-data-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query-HDBC";
        version = "0.7.1.1";
        sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk";
        libraryHaskellDepends = [
@@ -170947,7 +170745,6 @@ self: {
        ];
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record" = callPackage
@@ -174564,6 +174361,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rpmbuild-order" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory
+     , explicit-exception, fgl, filepath, process, transformers
+     }:
+     mkDerivation {
+       pname = "rpmbuild-order";
+       version = "0.1";
+       sha256 = "13hn4g2yh1llj7c661a9v25y3c5d3llsy3x4pk310ig08rzypvmi";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal containers directory explicit-exception fgl filepath
+         process transformers
+       ];
+       description = "Order RPM packages by dependencies";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rsagl" = callPackage
     ({ mkDerivation, array, arrows, base, containers
      , data-memocombinators, deepseq, mtl, old-time, OpenGL, OpenGLRaw
@@ -174667,34 +174482,6 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.4.2.1";
-       sha256 = "04jpc3zrm9sh1ncqz2n0qr7wgabgpi56vsj24rppqiwrx31jrxdq";
-       libraryHaskellDepends = [
-         atom-conduit base conduit conduit-combinators containers
-         dublincore-xml-conduit lens-simple safe safe-exceptions singletons
-         text time timerep uri-bytestring vinyl xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         atom-conduit base blaze-builder bytestring conduit
-         conduit-combinators data-default dublincore-xml-conduit lens-simple
-         mono-traversable QuickCheck quickcheck-instances resourcet
-         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
-         time uri-bytestring vinyl xml-conduit xml-types
-       ];
-       description = "Streaming parser/renderer for the RSS standard";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "rss-conduit_0_4_2_2" = callPackage
-    ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
-     , conduit, conduit-combinators, containers, data-default
-     , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
-     , quickcheck-instances, resourcet, safe, safe-exceptions
-     , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , timerep, uri-bytestring, vinyl, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "rss-conduit";
        version = "0.4.2.2";
        sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps";
        revision = "1";
@@ -174713,7 +174500,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -178480,8 +178266,8 @@ self: {
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.1.3.0";
-       sha256 = "0m2fs5d7w60mfihsyg95r6x923r0lby1g92bkzar0xm8r7kl1g90";
+       version = "0.2.0.0";
+       sha256 = "0w4mgcxdlhh9gqzjri8p7hpzsgjn3dxfjgs10nl1vriw22i1fn6p";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers vector
        ];
@@ -181036,8 +180822,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.6.2";
-       sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5";
+       version = "0.6.3";
+       sha256 = "0p7xxzrmg9qn8k0i363yrk91gy506vs3db9ncp8h4vw0sx58g2zq";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181055,7 +180841,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_7_2" = callPackage
+  "serverless-haskell_0_7_3" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -181063,8 +180849,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.7.2";
-       sha256 = "12nkqx8wsbc1l8hka8i0jr84gdf8k1wvsx5m6nabrnp60zxnqjxc";
+       version = "0.7.3";
+       sha256 = "0yzwzkdq4afyfdkrdd19a70x082grgzzzara2zyb08szv1gpmyn2";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181276,6 +181062,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "servius_1_2_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
+     , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
+     }:
+     mkDerivation {
+       pname = "servius";
+       version = "1.2.2.0";
+       sha256 = "14jfnjfdyvc63pi3kmhwxmq2hbrfh17xa3jxp9y2ag6iifycnmf7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-builder blaze-html bytestring cmark-gfm http-types
+         shakespeare text wai wai-app-static
+       ];
+       description = "Warp web server with template rendering";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ses-html" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, byteable
      , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time
@@ -184097,24 +183902,6 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.7";
-       sha256 = "1snhvy9nlwi6ka6lj6qhc3p9wz9q88mj9yr80lir7z0i1qy0yvar";
-       libraryHaskellDepends = [ base QuickCheck vector ];
-       testHaskellDepends = [
-         base doctest doctest-driver-gen tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion vector ];
-       description = "Three-dimensional vectors of doubles with basic operations";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "simple-vec3_0_4_0_8" = callPackage
-    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
-     , QuickCheck, tasty, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "simple-vec3";
        version = "0.4.0.8";
        sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a";
        libraryHaskellDepends = [ base QuickCheck vector ];
@@ -185824,8 +185611,8 @@ self: {
      }:
      mkDerivation {
        pname = "smuggler";
-       version = "0.0.0";
-       sha256 = "06myh42zc4rgis6bhng60i4skvm9kmvd63lasycp7198mjf61jsn";
+       version = "0.0.1";
+       sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186137,8 +185924,8 @@ self: {
        pname = "snap-loader-static";
        version = "1.0.0.0";
        sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas";
-       revision = "1";
-       editedCabalFile = "0ghxjdh5hv2nb3m1rax3rlgszxrfv4x1dxb5n4f1h6xaya9ya0hh";
+       revision = "2";
+       editedCabalFile = "1f9dn3x8m53rywlmmn274cfh0ahvaz9vqfc6cwc79bmbz0r7fq1z";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
@@ -189813,6 +189600,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "st2" = callPackage
+    ({ mkDerivation, base, gdp, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "st2";
+       version = "0.1.0.0";
+       sha256 = "0gly0l191cwnahdrmgi1i2rx4430b9d684kl9s5frxa3k1711agj";
+       libraryHaskellDepends = [ base gdp ghc-prim primitive ];
+       description = "shared heap regions between local mutable state threads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stable-heap" = callPackage
     ({ mkDerivation, base, criterion, fingertree, heaps, mwc-random
      , pqueue, vector
@@ -192266,8 +192064,8 @@ self: {
     ({ mkDerivation, base, bytestring, hidapi, mtl }:
      mkDerivation {
        pname = "streamdeck";
-       version = "0.0.1";
-       sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449";
+       version = "0.0.2";
+       sha256 = "0kvzm7995c8wlxgksdhvv612iik944lm6fizvh8wzjbjavgwhwy6";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
@@ -194095,8 +193893,8 @@ self: {
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.0.4";
-       sha256 = "1gwglx6lvg962q7a5m0vx372vqyiw3sf5kxsbwnl53pgrynmjhyn";
+       version = "1.0.5";
+       sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194113,27 +193911,25 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
-  "summoner_1_0_5" = callPackage
+  "summoner_1_0_6" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
      , filepath, generic-deriving, hedgehog, neat-interpolation
-     , optparse-applicative, process, tasty, tasty-discover
-     , tasty-hedgehog, text, time, tomland, universum
+     , optparse-applicative, process, relude, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.0.5";
-       sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
+       version = "1.0.6";
+       sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring directory filepath
          generic-deriving neat-interpolation optparse-applicative process
-         text time tomland universum
-       ];
-       executableHaskellDepends = [ base universum ];
-       testHaskellDepends = [
-         base hedgehog tasty tasty-hedgehog universum
+         relude text time tomland
        ];
+       executableHaskellDepends = [ base relude ];
+       testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ];
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
@@ -194992,6 +194788,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
+  "swish_0_10_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , HUnit, intern, mtl, network-uri, old-locale, polyparse
+     , semigroups, test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "swish";
+       version = "0.10.0.0";
+       sha256 = "1dm388lwfxrpdbqm3fdk9gjr8pp8y8s02wl9aan86av956g2kr4h";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable intern mtl network-uri
+         old-locale polyparse text time
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers hashable HUnit network-uri old-locale semigroups
+         test-framework test-framework-hunit text time
+       ];
+       description = "A semantic web toolkit";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sws" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, filepath
      , hourglass, http-types, network, resourcet, transformers, wai
@@ -198948,6 +198770,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "termbox-banana" = callPackage
+    ({ mkDerivation, base, reactive-banana, stm, termbox }:
+     mkDerivation {
+       pname = "termbox-banana";
+       version = "0.1.0";
+       sha256 = "0qyr2zykplxdg2x7k4xcg0cnv7lxx60lr55k8fs29556zalkgcgz";
+       libraryHaskellDepends = [ base reactive-banana stm termbox ];
+       description = "reactive-banana + termbox";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "termbox-bindings" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -218335,8 +218168,8 @@ self: {
      }:
      mkDerivation {
        pname = "wsjtx-udp";
-       version = "0.1.0.6";
-       sha256 = "04c44jbpnplil3l69s1bvn2dk2jbs4vkf82vlxpfrljnpfckllbc";
+       version = "0.1.3.4";
+       sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -221707,18 +221540,6 @@ self: {
     ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
      mkDerivation {
        pname = "yeshql";
-       version = "4.1.0.0";
-       sha256 = "04vi2m9av2dh6jxjlxvxi7j5llxjl2j1ww0cnjhkn7z2bllf77yq";
-       libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
-       description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yeshql_4_1_0_1" = callPackage
-    ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
-     mkDerivation {
-       pname = "yeshql";
        version = "4.1.0.1";
        sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4";
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
@@ -221733,25 +221554,6 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-core";
-       version = "4.1.0.0";
-       sha256 = "1zy2si96vm451z5yjmp5hzw94nqlx6v136l35130m82mdih0337w";
-       libraryHaskellDepends = [
-         base containers convertible filepath parsec template-haskell
-       ];
-       testHaskellDepends = [
-         base containers stm tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "YesQL-style SQL database abstraction (core)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yeshql-core_4_1_0_1" = callPackage
-    ({ mkDerivation, base, containers, convertible, filepath, parsec
-     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "yeshql-core";
        version = "4.1.0.1";
        sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
        libraryHaskellDepends = [
@@ -221772,27 +221574,6 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-hdbc";
-       version = "4.1.0.0";
-       sha256 = "152a2lw76jka83ywqliwhwijgwlsm6shlxj4qhbpmg8bam62b0k4";
-       libraryHaskellDepends = [
-         base containers convertible filepath HDBC parsec template-haskell
-         yeshql-core
-       ];
-       testHaskellDepends = [
-         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "YesQL-style SQL database abstraction (HDBC backend)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yeshql-hdbc_4_1_0_1" = callPackage
-    ({ mkDerivation, base, containers, convertible, filepath, HDBC
-     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, yeshql-core
-     }:
-     mkDerivation {
-       pname = "yeshql-hdbc";
        version = "4.1.0.1";
        sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
        libraryHaskellDepends = [
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
new file mode 100644
index 00000000000..426e5a4cbba
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.7.0";
+  sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm";
+  minimumOTPVersion = "18";
+}
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 78598ce3d81..7d3c6476131 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -37,7 +37,7 @@ in
 
     preBuild = ''
       # The build process uses ./rebar. Link it to the nixpkgs rebar
-      rm -v rebar
+      rm -vf rebar
       ln -s ${rebar}/bin/rebar rebar
 
       substituteInPlace Makefile \
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 52a3c64f81c..9bf8577923c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,21 +1,63 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
-
-{ lib, stdenv, fetchurl, composableDerivation, flex, bison
+{ lib, stdenv, fetchurl, flex, bison
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }:
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy
+}:
 
-let
+with lib;
 
+let
+  php7 = versionAtLeast version "7.0";
   generic =
-    { version, sha256 }:
-
-    let php7 = lib.versionAtLeast version "7.0";
-        mysqlndSupport = config.php.mysqlnd or false;
-        mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c;
-
-    in composableDerivation.composableDerivation {} (fixed: {
+  { version
+  , sha256
+  , imapSupport ? config.php.imap or (!stdenv.isDarwin)
+  , ldapSupport ? config.php.ldap or true
+  , mhashSupport ? config.php.mhash or true
+  , mysqlSupport ? (config.php.mysql or true) && (!php7)
+  , mysqlndSupport ? config.php.mysqlnd or true
+  , mysqliSupport ? config.php.mysqli or true
+  , pdo_mysqlSupport ? config.php.pdo_mysql or true
+  , libxml2Support ? config.php.libxml2 or true
+  , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin)
+  , embedSupport ? config.php.embed or false
+  , bcmathSupport ? config.php.bcmath or true
+  , socketsSupport ? config.php.sockets or true
+  , curlSupport ? config.php.curl or true
+  , curlWrappersSupport ? (config.php.curlWrappers or true) && (!php7)
+  , gettextSupport ? config.php.gettext or true
+  , pcntlSupport ? config.php.pcntl or true
+  , postgresqlSupport ? config.php.postgresql or true
+  , pdo_pgsqlSupport ? config.php.pdo_pgsql or true
+  , readlineSupport ? config.php.readline or true
+  , sqliteSupport ? config.php.sqlite or true
+  , soapSupport ? config.php.soap or true
+  , zlibSupport ? config.php.zlib or true
+  , opensslSupport ? config.php.openssl or true
+  , mbstringSupport ? config.php.mbstring or true
+  , gdSupport ? config.php.gd or true
+  , intlSupport ? config.php.intl or true
+  , exifSupport ? config.php.exif or true
+  , xslSupport ? config.php.xsl or false
+  , mcryptSupport ? config.php.mcrypt or true
+  , bz2Support ? config.php.bz2 or false
+  , zipSupport ? config.php.zip or true
+  , ftpSupport ? config.php.ftp or true
+  , fpmSupport ? config.php.fpm or true
+  , gmpSupport ? config.php.gmp or true
+  , mssqlSupport ? (config.php.mssql or (!stdenv.isDarwin)) && (!php7)
+  , ztsSupport ? config.php.zts or false
+  , calendarSupport ? config.php.calendar or true
+  , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
+  , tidySupport ? false
+  }:
+
+    let
+      mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c;
+      libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
+    in stdenv.mkDerivation {
 
       inherit version;
 
@@ -25,252 +67,99 @@ let
 
       nativeBuildInputs = [ pkgconfig ];
       buildInputs = [ flex bison pcre ]
-        ++ lib.optional stdenv.isLinux systemd;
-
-      CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11";
-
-      flags = {
-
-        # much left to do here...
-
-        # SAPI modules:
-
-        apxs2 = {
-          configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"];
-          buildInputs = [apacheHttpd];
-        };
-
-        embed = {
-          configureFlags = ["--enable-embed"];
-        };
-
-        # Extensions
-        imap = {
-          configureFlags = [
-            "--with-imap=${uwimap}"
-            "--with-imap-ssl"
-            ];
-          buildInputs = [ uwimap openssl pam ];
-        };
-
-        ldap = {
-          configureFlags = [
-            "--with-ldap=/invalid/path"
-            "LDAP_DIR=${openldap.dev}"
-            "LDAP_INCDIR=${openldap.dev}/include"
-            "LDAP_LIBDIR=${openldap.out}/lib"
-            (lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}")
-            ];
-          buildInputs = [openldap openssl] ++ lib.optional stdenv.isLinux cyrus_sasl;
-        };
-
-        mhash = {
-          configureFlags = ["--with-mhash"];
-          buildInputs = [libmhash];
-        };
-
-        curl = {
-          configureFlags = ["--with-curl=${curl.dev}"];
-          buildInputs = [curl openssl];
-        };
-
-        curlWrappers = {
-          configureFlags = ["--with-curlwrappers"];
-        };
-
-        zlib = {
-          configureFlags = ["--with-zlib=${zlib.dev}"];
-          buildInputs = [zlib];
-        };
-
-        libxml2 = {
-          configureFlags = [
-            "--with-libxml-dir=${libxml2.dev}"
-            ];
-          buildInputs = [ libxml2 ];
-        };
-
-        pcntl = {
-          configureFlags = [ "--enable-pcntl" ];
-        };
-
-        readline = {
-          configureFlags = ["--with-readline=${readline.dev}"];
-          buildInputs = [ readline ];
-        };
-
-        sqlite = {
-          configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"];
-          buildInputs = [ sqlite ];
-        };
-
-        postgresql = {
-          configureFlags = ["--with-pgsql=${postgresql}"];
-          buildInputs = [ postgresql ];
-        };
-
-        pdo_pgsql = {
-          configureFlags = ["--with-pdo-pgsql=${postgresql}"];
-          buildInputs = [ postgresql ];
-        };
-
-        mysql = {
-          configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
-          buildInputs = mysqlBuildInputs;
-        };
-
-        mysqli = {
-          configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"];
-          buildInputs = mysqlBuildInputs;
-        };
-
-        mysqli_embedded = {
-          configureFlags = ["--enable-embedded-mysqli"];
-          depends = "mysqli";
-          assertion = fixed.mysqliSupport;
-        };
-
-        pdo_mysql = {
-          configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"];
-          buildInputs = mysqlBuildInputs;
-        };
+        ++ optional stdenv.isLinux systemd
+        ++ optionals imapSupport [ uwimap openssl pam ]
+        ++ optionals curlSupport [ curl openssl ]
+        ++ optionals ldapSupport [ openldap openssl ]
+        ++ optionals gdSupport [ libpng libjpeg freetype ]
+        ++ optionals opensslSupport [ openssl openssl.dev ]
+        ++ optional apxs2Support apacheHttpd
+        ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
+        ++ optional mhashSupport libmhash
+        ++ optional zlibSupport zlib
+        ++ optional libxml2Support libxml2
+        ++ optional readlineSupport readline
+        ++ optional sqliteSupport sqlite
+        ++ optional postgresqlSupport postgresql
+        ++ optional pdo_pgsqlSupport postgresql
+        ++ optional pdo_mysqlSupport mysqlBuildInputs
+        ++ optional mysqlSupport mysqlBuildInputs
+        ++ optional mysqliSupport mysqlBuildInputs
+        ++ optional gmpSupport gmp
+        ++ optional gettextSupport gettext
+        ++ optional intlSupport icu
+        ++ optional xslSupport libxslt
+        ++ optional mcryptSupport libmcrypt'
+        ++ optional bz2Support bzip2
+        ++ optional (mssqlSupport && !stdenv.isDarwin) freetds
+        ++ optional sodiumSupport libsodium
+        ++ optional tidySupport html-tidy;
+
+      CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
 
-        bcmath = {
-          configureFlags = ["--enable-bcmath"];
-        };
 
-        gd = {
-          # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-          configureFlags = [
-            "--with-gd"
-            "--with-freetype-dir=${freetype.dev}"
-            "--with-png-dir=${libpng.dev}"
-            "--with-jpeg-dir=${libjpeg.dev}"
-          ];
-          buildInputs = [ libpng libjpeg freetype ];
-        };
-
-        gmp = {
-          configureFlags = ["--with-gmp=${gmp.dev}"];
-          buildInputs = [ gmp ];
-        };
-
-        soap = {
-          configureFlags = ["--enable-soap"];
-        };
-
-        sockets = {
-          configureFlags = ["--enable-sockets"];
-        };
-
-        openssl = {
-          configureFlags = ["--with-openssl"];
-          buildInputs = [openssl openssl.dev];
-        };
-
-        mbstring = {
-          configureFlags = ["--enable-mbstring"];
-        };
-
-        gettext = {
-          configureFlags = ["--with-gettext=${gettext}"];
-          buildInputs = [gettext];
-        };
-
-        intl = {
-          configureFlags = ["--enable-intl"];
-          buildInputs = [icu];
-        };
-
-        exif = {
-          configureFlags = ["--enable-exif"];
-        };
-
-        xsl = {
-          configureFlags = ["--with-xsl=${libxslt.dev}"];
-          buildInputs = [libxslt];
-        };
-
-        mcrypt = let libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in {
-          configureFlags = ["--with-mcrypt=${libmcrypt'}"];
-          buildInputs = [libmcrypt'];
-        };
-
-        bz2 = {
-          configureFlags = ["--with-bz2=${bzip2.dev}"];
-          buildInputs = [bzip2];
-        };
-
-        zip = {
-          configureFlags = ["--enable-zip"];
-        };
-
-        ftp = {
-          configureFlags = ["--enable-ftp"];
-        };
-
-        fpm = {
-          configureFlags = ["--enable-fpm"];
-        };
-
-        mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-          configureFlags = ["--with-mssql=${freetds}"];
-          buildInputs = [freetds];
-        };
-
-        zts = {
-          configureFlags = ["--enable-maintainer-zts"];
-        };
-
-        calendar = {
-          configureFlags = ["--enable-calendar"];
-        };
-
-        sodium = {
-          configureFlags = ["--with-sodium=${libsodium.dev}"];
-          buildInputs = [libsodium];
-        };
-      };
+      configureFlags = [
+        "--with-config-file-scan-dir=/etc/php.d"
+        "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
+      ]
+      ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
+      ++ optional stdenv.isLinux  "--with-fpm-systemd"
+      ++ optionals imapSupport [
+        "--with-imap=${uwimap}"
+        "--with-imap-ssl"
+      ]
+      ++ optionals ldapSupport [
+        "--with-ldap=/invalid/path"
+        "LDAP_DIR=${openldap.dev}"
+        "LDAP_INCDIR=${openldap.dev}/include"
+        "LDAP_LIBDIR=${openldap.out}/lib"
+      ]
+      ++ optional (ldapSupport && stdenv.isLinux)   "--with-ldap-sasl=${cyrus_sasl.dev}"
+      ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
+      ++ optional embedSupport "--enable-embed"
+      ++ optional mhashSupport "--with-mhash"
+      ++ optional curlSupport "--with-curl=${curl.dev}"
+      ++ optional curlWrappersSupport "--with-curlwrappers"
+      ++ optional zlibSupport "--with-zlib=${zlib.dev}"
+      ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
+      ++ optional pcntlSupport "--enable-pcntl"
+      ++ optional readlineSupport "--with-readline=${readline.dev}"
+      ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"
+      ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
+      ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
+      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
+      ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"
+      ++ optionals mysqliSupport [
+        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
+      ]
+      ++ optional bcmathSupport "--enable-bcmath"
+      # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
+      ++ optionals gdSupport [
+        "--with-gd"
+        "--with-freetype-dir=${freetype.dev}"
+        "--with-png-dir=${libpng.dev}"
+        "--with-jpeg-dir=${libjpeg.dev}"
+      ]
+      ++ optional gmpSupport "--with-gmp=${gmp.dev}"
+      ++ optional soapSupport "--enable-soap"
+      ++ optional socketsSupport "--enable-sockets"
+      ++ optional opensslSupport "--with-openssl"
+      ++ optional mbstringSupport "--enable-mbstring"
+      ++ optional gettextSupport "--with-gettext=${gettext}"
+      ++ optional intlSupport "--enable-intl"
+      ++ optional exifSupport "--enable-exif"
+      ++ optional xslSupport "--with-xsl=${libxslt.dev}"
+      ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
+      ++ optional bz2Support "--with-bz2=${bzip2.dev}"
+      ++ optional zipSupport "--enable-zip"
+      ++ optional ftpSupport "--enable-ftp"
+      ++ optional fpmSupport "--enable-fpm"
+      ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}"
+      ++ optional ztsSupport "--enable-maintainer-zts"
+      ++ optional calendarSupport "--enable-calendar"
+      ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
+      ++ optional tidySupport "--with-tidy=${html-tidy}";
 
-      cfg = {
-        imapSupport = config.php.imap or (!stdenv.isDarwin);
-        ldapSupport = config.php.ldap or true;
-        mhashSupport = config.php.mhash or true;
-        mysqlSupport = (!php7) && (config.php.mysql or true);
-        mysqliSupport = config.php.mysqli or true;
-        pdo_mysqlSupport = config.php.pdo_mysql or true;
-        libxml2Support = config.php.libxml2 or true;
-        apxs2Support = config.php.apxs2 or (!stdenv.isDarwin);
-        embedSupport = config.php.embed or false;
-        bcmathSupport = config.php.bcmath or true;
-        socketsSupport = config.php.sockets or true;
-        curlSupport = config.php.curl or true;
-        curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
-        gettextSupport = config.php.gettext or true;
-        pcntlSupport = config.php.pcntl or true;
-        postgresqlSupport = config.php.postgresql or true;
-        pdo_pgsqlSupport = config.php.pdo_pgsql or true;
-        readlineSupport = config.php.readline or true;
-        sqliteSupport = config.php.sqlite or true;
-        soapSupport = config.php.soap or true;
-        zlibSupport = config.php.zlib or true;
-        opensslSupport = config.php.openssl or true;
-        mbstringSupport = config.php.mbstring or true;
-        gdSupport = config.php.gd or true;
-        intlSupport = config.php.intl or true;
-        exifSupport = config.php.exif or true;
-        xslSupport = config.php.xsl or false;
-        mcryptSupport = config.php.mcrypt or true;
-        bz2Support = config.php.bz2 or false;
-        zipSupport = config.php.zip or true;
-        ftpSupport = config.php.ftp or true;
-        fpmSupport = config.php.fpm or true;
-        gmpSupport = config.php.gmp or true;
-        mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
-        ztsSupport = config.php.zts or false;
-        calendarSupport = config.php.calendar or true;
-        sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true;
-      };
 
       hardeningDisable = [ "bindnow" ];
 
@@ -292,12 +181,6 @@ let
           --includedir=$dev/include)
       '';
 
-      configureFlags = [
-        "--with-config-file-scan-dir=/etc/php.d"
-        "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
-      ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
-        ++ lib.optional stdenv.isLinux  "--with-fpm-systemd";
-
       postInstall = ''
         cp php.ini-production $out/etc/php.ini
       '';
@@ -326,7 +209,7 @@ let
 
       patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ];
 
-      postPatch = lib.optional stdenv.isDarwin ''
+      postPatch = optional stdenv.isDarwin ''
         substituteInPlace configure --replace "-lstdc++" "-lc++"
       '';
 
@@ -334,7 +217,7 @@ let
 
       outputs = [ "out" "dev" ];
 
-    });
+    };
 
 in {
   php56 = generic {
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 79aa85def3c..7d6f2541d3d 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, CF, configd, coreutils }:
+{ stdenv, fetchurl, configd, CF, coreutils }:
 
 with stdenv.lib;
 
@@ -75,6 +75,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {};
+
   meta = {
     homepage = http://python.org;
     description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index bb6f2758f4c..9e6d35b818f 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -133,6 +133,11 @@ let
           ++ op (stdenv.hostPlatform != stdenv.buildPlatform)
              "--with-baseruby=${buildRuby}";
 
+        # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
+        # mostly TZ- and patch-related tests
+        # TZ- failures are caused by nix sandboxing, I didn't investigate others
+        doCheck = false;
+
         preInstall = ''
           # Ruby installs gems here itself now.
           mkdir -pv "$out/${passthru.gemPath}"
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 688c9e300ed..a9652f4da3e 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
 
+  doCheck = false; # fails with "No test data file provided"
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index ba34e7f5f3f..9bbde08023b 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
   buildInputs = [ dbus glib libX11 libXtst libXi ];
 
+  doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
new file mode 100644
index 00000000000..d802d70adf3
--- /dev/null
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "libmysofa-${version}";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "hoene";
+    repo = "libmysofa";
+    rev = "v${version}";
+    sha256 = "160gcmsn6dwaca29bs95nsgjdalwc299lip0h37k3jcbxxkchgsh";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib ];
+
+  cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
+
+  meta = with stdenv.lib; {
+    description = "Reader for AES SOFA files to get better HRTFs";
+    homepage = https://github.com/hoene/libmysofa;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jfrankenau ];
+  };
+}
diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix
index 8b9e7ccca7f..150272df6ca 100644
--- a/pkgs/development/libraries/boost/1.67.nix
+++ b/pkgs/development/libraries/boost/1.67.nix
@@ -1,8 +1,14 @@
-{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
+{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.67_0";
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
+    sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
+    stripLen = 1;
+  })];
+
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
     # SHA256 from http://www.boost.org/users/history/version_1_66_0.html
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/development/libraries/dbxml/cxx11.patch
new file mode 100644
index 00000000000..f264515c7d6
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/cxx11.patch
@@ -0,0 +1,59 @@
+diff -urN dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp
+--- dbxml-6.1.4.orig/dbxml/src/dbxml/nodeStore/NsUpdate.cpp	2017-05-01 16:05:29.000000000 +0100
++++ dbxml-6.1.4/dbxml/src/dbxml/nodeStore/NsUpdate.cpp	2017-09-04 11:50:20.000000000 +0100
+@@ -1359,21 +1359,13 @@
+ void NsUpdate::attributeRemoved(const DbXmlNodeImpl &node)
+ {
+ 	string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ 	attrMap_.insert(make_pair(key,node.getIndex()));
+-#else
+-	attrMap_.insert(make_pair<const std::string, int>(key,node.getIndex()));
+-#endif
+ }
+ 
+ void NsUpdate::textRemoved(const DbXmlNodeImpl &node)
+ {
+ 	string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ 	textDeleteMap_.insert(make_pair(key,node.getIndex()));
+-#else
+-	textDeleteMap_.insert(make_pair<const std::string, int>(key,node.getIndex()));
+-#endif
+ }
+ 
+ void NsUpdate::textRemoved(int index, const NsNid &nid,
+@@ -1381,21 +1373,13 @@
+ 			   const std::string &cname)
+ {
+ 	string key = makeKey(nid, did, cname);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ 	textDeleteMap_.insert(make_pair(key,index));
+-#else
+-	textDeleteMap_.insert(make_pair<const std::string, int>(key,index));
+-#endif
+ }
+ 
+ void NsUpdate::textInserted(int index, const DbXmlNodeImpl &node)
+ {
+ 	string key = makeKey(node);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ 	textInsertMap_.insert(make_pair(key,index));
+-#else
+-	textInsertMap_.insert(make_pair<const std::string, int>(key,index));
+-#endif
+ }
+ 
+ void NsUpdate::textInserted(int index, const NsNid &nid,
+@@ -1403,11 +1387,7 @@
+ 			    const std::string &cname)
+ {
+ 	string key = makeKey(nid, did, cname);
+-#if defined(_MSC_VER) && (_MSC_VER>1600)
+ 	textInsertMap_.insert(make_pair(key,index));
+-#else
+-	textInsertMap_.insert(make_pair<const std::string, int>(key,index));
+-#endif
+ }
+ 
+ //
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
new file mode 100644
index 00000000000..0bab58b242d
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, db62, xercesc, xqilla }:
+
+stdenv.mkDerivation rec {
+  name = "dbxml-${version}";
+  version = "6.1.4";
+
+  src = fetchurl {
+    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    sha256 = "a8fc8f5e0c3b6e42741fa4dfc3b878c982ff8f5e5f14843f6a7e20d22e64251a";
+  };
+
+  patches = [
+    ./cxx11.patch
+    ./incorrect-optimization.patch
+  ];
+
+  buildInputs = [
+    db62 xercesc xqilla
+  ];
+
+  configureFlags = [
+    "--with-berkeleydb=${db62.out}"
+    "--with-xerces=${xercesc}"
+    "--with-xqilla=${xqilla}"
+  ];
+
+  preConfigure = ''
+    cd dbxml
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.oracle.com/database/berkeley-db/xml.html;
+    description = "Embeddable XML database based on Berkeley DB";
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ danieldk ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/development/libraries/dbxml/incorrect-optimization.patch
new file mode 100644
index 00000000000..630dc972e18
--- /dev/null
+++ b/pkgs/development/libraries/dbxml/incorrect-optimization.patch
@@ -0,0 +1,34 @@
+Patch provided by Lauren Foutz. See:
+https://community.oracle.com/thread/4093422
+
+--- dbxml-6.1.4-orig/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp
++++ dbxml-6.1.4/dbxml/src/dbxml/query/ParentOfChildJoinQP.cpp
+@@ -139,28 +139,16 @@ bool ParentOfChildIterator::doJoin(Dynam
+ 
+ 	// Invarient 4: When ancestorStack_ is empty we can output the
+ 	// buffered results_, since any more results will come after them in
+ 	// document order.
+ 
+ 	while(true) {
+ 		context->testInterrupt();
+ 
+-		/* 
+-		 * If current parent's node level already be larger than
+-		 * childen's, abandon current parent and move to next one.
+-		 */
+-		if (parents_ != NULL && 
+-		    parents_->getNodeLevel() > children_->getNodeLevel()) {
+-			if(!parents_->next(context)) {
+-				delete parents_;
+-				parents_ = 0;
+-			}
+-		}
+-
+ 		int cmp = parents_ == 0 ? -1 : isDescendantOf(children_, parents_, /*orSelf*/false);
+ 		if(cmp < 0) {
+ 			if(!ancestorStack_.empty()) {
+ 				// We've found the closest ancestor - is it a parent?
+ 				if(ancestorStack_.back()->getNodeLevel() == (children_->getNodeLevel() - 1)) {
+ 					// Maintain invarient 3
+ 					if(results_.empty() || NodeInfo::compare(results_.back(), ancestorStack_.back()) < 0)
+ 						results_.push_back(ancestorStack_.back());
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 34c649022cf..e8e177de06a 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -77,6 +77,7 @@
 #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
 #, libmfx ? null # Hardware acceleration vis libmfx
 , libmodplug ? null # ModPlug support
+, libmysofa ? null # HRTF support via SOFAlizer
 #, libnut ? null # NUT (de)muxer, native (de)muser exists
 , libogg ? null # Ogg container used by vorbis & theora
 , libopus ? null # Opus de/encoder
@@ -344,6 +345,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
     #(enableFeature (libmfx != null) "libmfx")
     (enableFeature (libmodplug != null) "libmodplug")
+    (enableFeature (libmysofa != null) "libmysofa")
     #(enableFeature (libnut != null) "libnut")
     (enableFeature (libopus != null) "libopus")
     (enableFeature (libssh != null) "libssh")
@@ -405,7 +407,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
-    libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
+    libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
     libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
     samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 7a903f00ae6..208d88ed18e 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -5,6 +5,7 @@
 , ninja
 , pkgconfig
 , fixDarwinDylibNames
+, python3
 }:
 
 stdenv.mkDerivation rec {
@@ -12,16 +13,22 @@ stdenv.mkDerivation rec {
   pname = "fribidi";
   version = "1.0.4";
 
+  outputs = [ "out" "devdoc" ];
+
   # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
     sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
   };
 
+  postPatch = ''
+    patchShebangs test
+  '';
+
   nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  outputs = [ "out" "devdoc" ];
+  checkInptus = [ python3 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/fribidi/fribidi;
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
new file mode 100644
index 00000000000..0a29ab6927f
--- /dev/null
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -0,0 +1,152 @@
+{ stdenvNoLibs, buildPackages, buildPlatform, hostPlatform
+, gcc, glibc
+, libiberty
+}:
+
+stdenvNoLibs.mkDerivation rec {
+  name = "libgcc-${version}";
+  inherit (gcc.cc) src version;
+
+  outputs = [ "out" "dev" ];
+
+  strictDeps = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ libiberty ];
+
+  postUnpack = ''
+    mkdir -p ./build
+    buildRoot=$(readlink -e "./build")
+  '';
+
+  postPatch = ''
+    sourceRoot=$(readlink -e "./libgcc")
+  '';
+
+  preConfigure = ''
+    cd "$buildRoot"
+  ''
+
+  # Drop in libiberty, as external builds are not expected
+  + ''
+    (
+      mkdir -p build-${buildPlatform.config}/libiberty/
+      cd build-${buildPlatform.config}/libiberty/
+      ln -s ${buildPackages.libiberty}/lib/libiberty.a ./
+    )
+  ''
+  # A few misc bits of gcc need to be built.
+  #
+  #  - We "shift" the tools over to fake platforms perspective from the previous
+  #    stage.
+  #
+  #  - We define GENERATOR_FILE so nothing bothers looking for GNU GMP.
+  #
+  #  - We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.
+  + ''
+    mkdir -p "$buildRoot/gcc"
+    cd "$buildRoot/gcc"
+    (
+      export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
+      export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
+      export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
+      export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
+      export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
+
+      export AS=$AS_FOR_BUILD
+      export CC=$CC_FOR_BUILD
+      export CPP=$CPP_FOR_BUILD
+      export CXX=$CXX_FOR_BUILD
+      export LD=$LD_FOR_BUILD
+
+      export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS
+      export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC
+      export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP
+      export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD
+
+      export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1'
+
+      "$sourceRoot/../gcc/configure" $gccConfigureFlags
+
+      sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile
+
+      make \
+        config.h \
+        libgcc.mvars \
+        tconfig.h \
+        tm.h \
+        options.h \
+        insn-constants.h \
+        insn-modes.h \
+        gcov-iov.h
+    )
+    mkdir -p "$buildRoot/gcc/include"
+  ''
+  # Preparing to configure + build libgcc itself
+  + ''
+    mkdir -p "$buildRoot/gcc/${hostPlatform.config}/libgcc"
+    cd "$buildRoot/gcc/${hostPlatform.config}/libgcc"
+    configureScript=$sourceRoot/configure
+    chmod +x "$configureScript"
+
+    export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD
+    export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD
+    export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD
+    export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD
+    export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD
+
+    export AS=${stdenvNoLibs.cc}/bin/$AS
+    export CC=${stdenvNoLibs.cc}/bin/$CC
+    export CPP=${stdenvNoLibs.cc}/bin/$CPP
+    export CXX=${stdenvNoLibs.cc}/bin/$CXX
+    export LD=${stdenvNoLibs.cc.bintools}/bin/$LD
+
+    export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET
+    export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET
+    export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET
+    export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET
+  '';
+
+  gccConfigureFlags = [
+    "--build=${buildPlatform.config}"
+    "--host=${buildPlatform.config}"
+    "--target=${hostPlatform.config}"
+
+    "--disable-bootstrap"
+    "--disable-multilib" "--with-multilib-list="
+    "--enable-languages=c"
+
+    "--disable-fixincludes"
+    "--disable-intl"
+    "--disable-lto"
+    "--disable-libatomic"
+    "--disable-libbacktrace"
+    "--disable-libcpp"
+    "--disable-libssp"
+    "--disable-libquadmath"
+    "--disable-libgomp"
+    "--disable-libvtv"
+    "--disable-vtable-verify"
+
+    "--with-system-zlib"
+  ] ++ stdenvNoLibs.lib.optional (hostPlatform.libc == "glibc")
+       "--with-glibc-version=${glibc.version}";
+
+  configurePlatforms = [ "build" "host" ];
+  configureFlags = [
+    "--disable-dependency-tracking"
+    # $CC cannot link binaries, let alone run then
+    "cross_compiling=true"
+    # Do not have dynamic linker without libc
+    "--enable-static"
+    "--disable-shared"
+  ];
+
+  makeFlags = [ "MULTIBUILDTOP:=../" ];
+
+  postInstall = ''
+    moveToOutput "lib/gcc/${hostPlatform.config}/${version}/include" "$dev"
+    mkdir -p "$out/lib" "$dev/include"
+    ln -s "$out/lib/gcc/${hostPlatform.config}/${version}"/* "$out/lib"
+    ln -s "$dev/lib/gcc/${hostPlatform.config}/${version}/include"/* "$dev/include/"
+  '';
+}
diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index f8397052b77..f8397052b77 100644
--- a/pkgs/development/libraries/libstdc++5/default.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
index 8c91d75f2a5..8c91d75f2a5 100644
--- a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch
+++ b/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
diff --git a/pkgs/development/libraries/libstdc++5/struct-ucontext.patch b/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
index 5462e0e33ec..5462e0e33ec 100644
--- a/pkgs/development/libraries/libstdc++5/struct-ucontext.patch
+++ b/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 4c858242bb5..86cbd01a602 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -4,7 +4,7 @@
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
 , gnomeSupport ? false, gnome, makeWrapper
 , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
-, libsecret, libgdata
+, libsecret, libgdata, python3
 # Remove when switching back to meson
 , autoreconfHook, lzma, bzip2
 }:
@@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
   };
 
+  postPatch = ''
+    patchShebangs test test-driver
+  '';
+
   # Uncomment when switching back to meson
   # postPatch = ''
   #   chmod +x meson_post_install.py # patchShebangs requires executable file
@@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  checkInputs = [ python3 ];
+  doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
+  doInstallCheck = doCheck;
+
   preFixup = ''
     for f in $out/libexec/*; do
       wrapProgram $f \
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 956a8667be5..156b4f72749 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bootstrap.patch ];
 
+  # fails 1 out of 1 tests with
+  # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
+  # at least on i686. spooky!
+  doCheck = stdenv.isx86_64;
+
   meta = with stdenv.lib; {
     homepage = http://www.openexr.com/;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index d705aa3388f..8f9c75c441d 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -3,6 +3,9 @@
 
 # Extra Arguments
 , type ? ""
+# This is called "staticOnly" because krb5 does not support
+# builting both static and shared, see below.
+, staticOnly ? false
 }:
 
 let
@@ -22,6 +25,9 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
+    # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.
+    # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737
+    ++ optional staticOnly [ "--enable-static" "--disable-shared" ]
     ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""''
     ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform)
        [ "krb5_cv_attr_constructor_destructor=yes,yes"
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 0788236b601..f247c48821f 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
 
   # The tests fail on darwin because of install_name if they run
   # before the frameworks are installed.
+  doCheck = false;
   doInstallCheck = true;
   installCheckTarget = "check";
 
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 1c7c0715e75..6f1aeefa675 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, fetchpatch,  dejagnu, doCheck ? false
+{ stdenv, fetchurl, fetchpatch
 , buildPlatform, hostPlatform, autoreconfHook
+
+# libffi is used in darwin stdenv
+# we cannot run checks within it
+, doCheck ? !stdenv.isDarwin, dejagnu
 }:
 
 stdenv.mkDerivation rec {
@@ -40,8 +44,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "man" "info" ];
 
-  buildInputs = stdenv.lib.optional doCheck dejagnu;
-
   nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
 
   configureFlags = [
@@ -54,6 +56,8 @@ stdenv.mkDerivation rec {
     NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
   '';
 
+  checkInputs = [ dejagnu ];
+
   inherit doCheck;
 
   dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index a86cf9b935c..367f1c9aadd 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.12.3";
+  version = "0.13.0";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5";
+    sha256 = "0sk8kz2zrvf7kp9jrp3l4rpipv4xh0hg8d4h734xyag7vd03rjpz";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index cdf93b0b2ff..1f58545574c 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
   propagatedBuildInputs = [ glib gupnp-igd ];
 
+  doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
+
   meta = {
     homepage = https://nice.freedesktop.org/wiki/;
     description = "The GLib ICE implementation";
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 8f8a54337f2..41047796662 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
+, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins
 }:
 
 stdenv.mkDerivation rec {
@@ -11,14 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
   };
 
-  preAutoreconf = "rm m4/*";
-  postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c";
+  postPatch = stdenv.lib.optionalString doCheck ''
+    sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
+  '';
 
+  preAutoreconf = "rm m4/*";
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ ladspaH openssl zlib ];
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
+  inherit doCheck;
+
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = https://sourceforge.net/projects/lrdf/;
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 07f560fe272..124fd017818 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }:
+{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }:
 
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.33";
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rvf $out/share/gtk-doc";
 
+  checkInputs = [ perl ];
+  doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..."
+  doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)"
+
   meta = {
     description = "Library that handles Resource Description Framework (RDF)";
     homepage = http://librdf.org/rasqal;
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index fce15b121b4..c8b299034fc 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -1,11 +1,50 @@
-{ stdenv, fetchurl, patchelf }:
-stdenv.mkDerivation rec {
+{ stdenv
+, fetchurl
+, patchelf
+, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
+}:
+with stdenv.lib;
+let
+  tfType = if cudaSupport then "gpu" else "cpu";
+  system =
+    if stdenv.isx86_64
+    then if      stdenv.isLinux  then "linux-x86_64"
+         else if stdenv.isDarwin then "darwin-x86_64" else unavailable
+    else unavailable;
+  unavailable = throw "libtensorflow is not available for this platform!";
+  cudatoolkit_joined = symlinkJoin {
+    name = "unsplit_cudatoolkit";
+    paths = [ cudatoolkit.out
+              cudatoolkit.lib ];};
+  rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] ++
+            optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]);
+  patchLibs =
+    if stdenv.isDarwin
+    then ''
+      install_name_tool -id $out/lib/libtensorflow.so $out/lib/libtensorflow.so
+      install_name_tool -id $out/lib/libtensorflow_framework.so $out/lib/libtensorflow_framework.so
+    ''
+    else ''
+      ${patchelf}/bin/patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so
+      ${patchelf}/bin/patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so
+    '';
+
+in stdenv.mkDerivation rec {
   pname = "libtensorflow";
   version = "1.8.0";
   name = "${pname}-${version}";
   src = fetchurl {
-    url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz";
-    sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha";
+    url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
+    sha256 =
+      if system == "linux-x86_64" then
+        if cudaSupport
+        then "0m1g4sqr9as0jgfx7wlyay2nkad6wgvsyk2gvhfkqkq5sm1vbx85"
+        else "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha"
+      else if system == "darwin-x86_64" then
+        if cudaSupport
+        then unavailable
+        else "0q8lmyj8l50hl6l48c640ixanvhqf2836bicyl9p2x8sj97b7y8l"
+      else unavailable;
   };
 
   # Patch library to use our libc, libstdc++ and others
@@ -15,18 +54,16 @@ stdenv.mkDerivation rec {
     tar -C $out -xzf $src
     chmod +w $out/lib/libtensorflow.so
     chmod +w $out/lib/libtensorflow_framework.so
-    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so
-    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so
+    ${patchLibs}
     chmod -w $out/lib/libtensorflow.so
     chmod -w $out/lib/libtensorflow_framework.so
   '';
 
-  meta = with stdenv.lib; {
-    inherit version;
+  meta = {
     description = "C API for TensorFlow";
+    homepage = https://www.tensorflow.org/versions/master/install/install_c;
     license = licenses.asl20;
+    platforms = with platforms; linux ++ darwin;
     maintainers = [maintainers.basvandijk];
-    platforms = platforms.linux;
-    homepage = https://www.tensorflow.org/versions/master/install/install_c;
   };
 }
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index b28f241d56e..aa78d0d33c0 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,9 +1,10 @@
 { stdenv, lib, fetchurl
-, zlib, xz, python2, findXMLCatalogs, libiconv
+, zlib, xz, python2, findXMLCatalogs
 , buildPlatform, hostPlatform
 , pythonSupport ? buildPlatform == hostPlatform
 , icuSupport ? false, icu ? null
-, enableStatic ? false
+, enableShared ? hostPlatform.libc != "msvcrt"
+, enableStatic ? !enableShared,
 }:
 
 let
@@ -35,22 +36,14 @@ in stdenv.mkDerivation rec {
        lib.optional pythonSupport "--with-python=${python}"
     ++ lib.optional icuSupport    "--with-icu"
     ++ [ "--exec_prefix=$dev" ]
-    ++ lib.optional enableStatic "--enable-static";
+    ++ lib.optional enableStatic "--enable-static"
+    ++ lib.optional (!enableShared) "--disable-shared";
 
   enableParallelBuilding = true;
 
   doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
     hostPlatform.libc != "musl";
 
-  crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
-    # creating the DLL is broken ATM
-    dontDisableStatic = true;
-    configureFlags = configureFlags ++ [ "--disable-shared" ];
-
-    # libiconv is a header dependency - propagating is enough
-    propagatedBuildInputs =  [ findXMLCatalogs libiconv ];
-  };
-
   preInstall = lib.optionalString pythonSupport
     ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
   installFlags = lib.optionalString pythonSupport
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 90d86ea9165..43fee9ccead 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, boost }:
 
 stdenv.mkDerivation rec {
   version = "1.3.1";
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
    cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
   '';
 
+  checkInputs = [ boost ];
+
   meta = {
     inherit version;
     homepage = https://gitlab.com/mdds/mdds;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 028930ba066..480afcf607a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -92,7 +92,7 @@ let self = stdenv.mkDerivation {
   patches = [
     ./glx_ro_text_segm.patch # fix for grsecurity/PaX
     ./symlink-drivers.patch
-    ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl
+    ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
   ];
 
   outputs = [ "out" "dev" "drivers" "osmesa" ];
diff --git a/pkgs/development/libraries/mesa/missing-include.patch b/pkgs/development/libraries/mesa/missing-include.patch
deleted file mode 100644
index dd3e6bb64af..00000000000
--- a/pkgs/development/libraries/mesa/missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
-+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
- 
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
- 
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
new file mode 100644
index 00000000000..feb6ffe428c
--- /dev/null
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -0,0 +1,55 @@
+--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
++++ ./src/gallium/winsys/svga/drm/vmw_screen.h
+@@ -34,7 +34,7 @@
+ #ifndef VMW_SCREEN_H_
+ #define VMW_SCREEN_H_
+ 
+-
++#include <sys/stat.h>
+ #include "pipe/p_compiler.h"
+ #include "pipe/p_state.h"
+ 
+--- ./src/gallium/state_trackers/nine/threadpool.h.orig	2015-05-07 14:10:53.443337212 +0200
++++ ./src/gallium/state_trackers/nine/threadpool.h	2015-05-07 14:11:04.210307653 +0200
+@@ -24,6 +24,8 @@
+ #ifndef _THREADPOOL_H_
+ #define _THREADPOOL_H_
+ 
++#include <pthread.h>
++
+ #define MAXTHREADS 1
+ 
+ struct threadpool {
+--- ./src/util/rand_xor.c.orig	2017-06-20 00:38:57.199474067 +0200
++++ ./src/util/rand_xor.c	2017-06-20 00:40:31.351279557 +0200
+@@ -23,7 +23,9 @@
+  */
+ 
+ #if defined(__linux__)
++#include <sys/types.h>
+ #include <sys/file.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #else
+--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
++++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
+@@ -37,6 +37,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <time.h>
+ #include "util/u_atomic.h"
+ #include "util/list.h"
+
+--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
++++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+@@ -28,6 +28,8 @@
+ #ifndef RADV_AMDGPU_WINSYS_H
+ #define RADV_AMDGPU_WINSYS_H
+ 
++#include <sys/types.h>
++
+ #include "radv_radeon_winsys.h"
+ #include "ac_gpu_info.h"
+ #include "addrlib/addrinterface.h"<Paste>
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index e393d50bf9d..dbde83c2d94 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
 
   passthru = {inherit compressionSupport sslSupport;};
 
+  checkInputs = [ perl ];
+  doCheck = false; # fails, needs the net
+
   meta = {
     description = "An HTTP and WebDAV client library";
     homepage = http://www.webdav.org/neon/;
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 2351e3b0800..9c2a3265491 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, pkgconfig
+{ stdenv, fetchurl, libxml2, pkgconfig, perl
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
 
   passthru = {inherit compressionSupport sslSupport;};
 
+  checkInputs = [ perl ];
+  doCheck = false; # fails, needs the net
+
   meta = {
     description = "An HTTP and WebDAV client library";
     homepage = http://www.webdav.org/neon/;
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index cd1e51bd19c..a10f52462a8 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
     unset CPP
   '';
 
-  crossAttrs = {
-    makeFlags = "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
-  };
+  # Use `lib.optionalString` next mass rebuild.
+  makeFlags = if stdenv.buildPlatform == stdenv.hostPlatform
+              then null
+              else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
 
   meta = with stdenv.lib; {
     homepage = https://fedorahosted.org/newt/;
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 59cc9438a9f..0e9ff5d9105 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -15,17 +15,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  doCheck = true;
+  doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
   checkTarget = "test";
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    cmakeFlags = "-DBuildTests=OFF";
-    doCheck = false;
-  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
-    cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows";
-  };
+  cmakeFlags = [
+    "-DBuildTests=${if doCheck then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [
+    "-DCMAKE_SYSTEM_NAME=Windows"
+  ];
 
   meta = with stdenv.lib; {
     description = "Header only C++ library for the JSON file format";
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index 203be8b6907..c02998184fc 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "npth-1.5";
+  name = "npth-1.6";
 
   src = fetchurl {
     url = "mirror://gnupg/npth/${name}.tar.bz2";
-    sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
+    sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d2c2cec6221..e97aa0d391e 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -35,20 +35,20 @@
 }:
 
 let
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h";
+    sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
     rev    = version;
-    sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3";
+    sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
   };
 
   # Contrib must be built in order to enable Tesseract support:
@@ -59,16 +59,16 @@ let
     src = fetchFromGitHub {
       owner  = "opencv";
       repo   = "opencv_3rdparty";
-      rev    = "dfe3162c237af211e98b8960018b564bc209261d";
-      sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif";
+      rev    = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a";
+      sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8";
     } + "/ippicv";
-    files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in
+    files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in
       if stdenv.system == "x86_64-linux" then
-      { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; }
+      { ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; }
       else if stdenv.system == "i686-linux" then
-      { ${name "lnx_ia32"}    = "dcdb0ba4b123f240596db1840cd59a76"; }
+      { ${name "lnx_ia32"}    = "ea72de74dae3c604eb6348395366e78e"; }
       else if stdenv.system == "x86_64-darwin" then
-      { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; }
+      { ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; }
       else
       throw "ICV is not available for this platform (or not yet supported by this package)";
     dst = ".cache/ippicv";
@@ -132,17 +132,6 @@ let
     ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
   '') extra.files);
 
-  # See opencv_contrib/modules/dnn_modern/CMakeLists.txt
-  tinyDnn = rec {
-    src = fetchurl {
-      url    = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}";
-      sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2";
-    };
-    name = "v1.0.0a3.tar.gz";
-    md5  = "adb1c512e09ca2c7a6faef36f9c53e59";
-    dst  = ".cache/tiny_dnn";
-  };
-
   opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
 
   printEnabled = enabled : if enabled then "ON" else "OFF";
@@ -156,6 +145,11 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
   '';
 
+  # TODO: remove the following patch once commit
+  # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
+  # is released.
+  patches = [ ./fix-dnn.patch ];
+
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
   # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
@@ -174,9 +168,6 @@ stdenv.mkDerivation rec {
       ${installExtraFiles vgg}
       ${installExtraFiles boostdesc}
       ${installExtraFiles face}
-
-      mkdir -p "${tinyDnn.dst}"
-      ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}"
     '');
 
   buildInputs =
@@ -243,9 +234,6 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isDarwin [
     "-DWITH_OPENCL=OFF"
     "-DWITH_LAPACK=OFF"
-
-    # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build.
-    "-DBUILD_opencv_dnn_modern=OFF"
   ];
 
   enableParallelBuilding = true;
@@ -273,11 +261,11 @@ stdenv.mkDerivation rec {
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = https://opencv.org/;
-    license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3;
-    maintainers = with stdenv.lib.maintainers; [mdaiter basvandijk];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = with licenses; if enableUnfree then unfree else bsd3;
+    maintainers = with maintainers; [mdaiter basvandijk];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
new file mode 100644
index 00000000000..62234a43e46
--- /dev/null
+++ b/pkgs/development/libraries/opencv/fix-dnn.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
+index 730c752ce..abbce0453 100644
+--- a/modules/dnn/src/caffe/caffe_io.cpp
++++ b/modules/dnn/src/caffe/caffe_io.cpp
+@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
+     std::ifstream fs(filename, std::ifstream::in);
+     CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
+     IstreamInputStream input(&fs);
+-    return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
++    return google::protobuf::TextFormat::Parser().Parse(&input, proto);
+ }
+ 
+ bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b5b9ae76646..4df0e08e6a7 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,6 +2,7 @@
 , buildPlatform, hostPlatform
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false
+, static ? false
 }:
 
 with stdenv.lib;
@@ -63,7 +64,7 @@ let
     '';
 
     configureFlags = [
-      "shared"
+      "shared" # "shared" builds both shared and static libraries
       "--libdir=lib"
       "--openssldir=etc/ssl"
     ] ++ stdenv.lib.optionals withCryptodev [
@@ -76,13 +77,16 @@ let
 
     enableParallelBuilding = true;
 
-    postInstall = ''
+    postInstall =
+    stdenv.lib.optionalString (!static) ''
       # 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
 
+    '' +
+    ''
       mkdir -p $bin
       mv $out/bin $bin/
 
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 59f674789e4..9fb2e0b7fed 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
+{ stdenv, fetchFromGitHub, fetchpatch, cmake
+, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase
 , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL
 }:
 
@@ -12,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq";
   };
 
+  patches = [
+    # boost-1.67 compatibility
+    (fetchpatch {
+      url = "https://github.com/PointCloudLibrary/pcl/commit/2309bdab20fb2a385d374db6a87349199279db18.patch";
+      sha256 = "112p4687xrm0vsm0magmkvsm1hpks9hj42fm0lncy3yy2j1v3r4h";
+      name = "boost167-random.patch";
+  })];
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 01d0fc510aa..471f11ad107 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, substituteAll
-, hostPlatform
+{ stdenv, lib, fetchurl, fetchpatch, substituteAll
 , libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
@@ -17,8 +16,6 @@
 , cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
 }:
 
-with stdenv.lib;
-
 let
   v_maj = "4.8";
   v_min = "7";
@@ -51,12 +48,12 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace /bin/pwd pwd
     substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
     sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # remove impure reference to /usr/lib/libstdc++.6.dylib
     # there might be more references, but this is the only one I could find
     substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \
       --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \
       --replace 'optionalHeight > 0' 'optionalHeight != NULL'
 
@@ -65,14 +62,15 @@ stdenv.mkDerivation rec {
   '';
 
   patches =
-    [ ./glib-2.32.patch
+    lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+      ./glib-2.32.patch
       ./libressl.patch
       ./parallel-configure.patch
       ./clang-5-darwin.patch
       ./qt-4.8.7-unixmake-darwin.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        cups = if cups != null then stdenv.lib.getLib cups else null;
+        cups = if cups != null then lib.getLib cups else null;
         icu = icu.out;
         libXfixes = libXfixes.out;
         glibc = stdenv.cc.libc.out;
@@ -89,25 +87,25 @@ stdenv.mkDerivation rec {
         sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
       })
     ]
-    ++ stdenv.lib.optional gtkStyle (substituteAll ({
+    ++ lib.optional gtkStyle (substituteAll ({
         src = ./dlopen-gtkstyle.diff;
         # substituteAll ignores env vars starting with capital letter
         gtk = gtk2.out;
-      } // stdenv.lib.optionalAttrs gnomeStyle {
+      } // lib.optionalAttrs gnomeStyle {
         gconf = GConf.out;
         libgnomeui = libgnomeui.out;
         gnome_vfs = gnome_vfs.out;
       }))
-    ++ stdenv.lib.optional flashplayerFix (substituteAll {
+    ++ lib.optional flashplayerFix (substituteAll {
         src = ./dlopen-webkit-nsplugin.diff;
         gtk = gtk2.out;
         gdk_pixbuf = gdk_pixbuf.out;
       })
-    ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
+    ++ lib.optional stdenv.isAarch64 (fetchpatch {
         url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";
         sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl";
       })
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    ++ lib.optionals stdenv.hostPlatform.isMusl [
         ./qt-musl.patch
         ./qt-musl-iconv-no-bom.patch
         ./patch-qthread-stacksize.diff
@@ -127,15 +125,27 @@ stdenv.mkDerivation rec {
       --jobs=$NIX_BUILD_CORES
     "
     unset LD # Makefile uses gcc for linking; setting LD interferes
-  '' + optionalString stdenv.cc.isClang ''
+  '' + lib.optionalString stdenv.cc.isClang ''
     sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
     sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
+  '' + lib.optionalString stdenv.hostPlatform.isWindows ''
+    sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
+      -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
+      -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
+      -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
+      -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
+      mkspecs/win32-g++/qmake.conf
   '';
 
   prefixKey = "-prefix ";
 
-  configureFlags =
-    ''
+  ${if stdenv.hostPlatform == stdenv.buildPlatform then null else "configurePlatforms"} = [];
+  configureFlags = let
+    platformFlag =
+      if stdenv.hostPlatform != stdenv.buildPlatform
+      then "-xplatform"
+      else "-platform";
+    in (if stdenv.hostPlatform == stdenv.buildPlatform then ''
       -v -no-separate-debug-info -release -fast -confirm-license -opensource
 
       -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
@@ -152,23 +162,30 @@ stdenv.mkDerivation rec {
 
       -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
       ${if developerBuild then "-developer-build" else ""}
-    '' + optionalString stdenv.isDarwin "-platform unsupported/macx-clang-libc++";
+    '' else ''
+      -static -release -confirm-license -opensource
+      -no-opengl -no-phonon
+      -no-svg
+      -make qmake -make libs -nomake tools
+      -nomake demos -nomake examples -nomake docs
+    '') + lib.optionalString stdenv.hostPlatform.isDarwin "${platformFlag} unsupported/macx-clang-libc++"
+        + lib.optionalString stdenv.hostPlatform.isMinGW  "${platformFlag} win32-g++-4.6";
 
   propagatedBuildInputs =
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
       libSM zlib libpng openssl dbus freetype fontconfig glib ]
         # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
-    ++ optional libGLSupported libGLU
-    ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
-    ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
+    ++ lib.optional libGLSupported libGLU
+    ++ lib.optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
+    ++ lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
 
   # The following libraries are only used in plugins
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
       postgresql sqlite libjpeg libmng libtiff icu ]
-    ++ optionals (mysql != null) [ mysql.connector-c ]
-    ++ optionals gtkStyle [ gtk2 gdk_pixbuf ]
-    ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
+    ++ lib.optionals (mysql != null) [ mysql.connector-c ]
+    ++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
+    ++ lib.optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
@@ -177,14 +194,14 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE =
     # with gcc7 the warnings blow the log over Hydra's limit
     [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ]
-    ++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
-    ++ optionals (stdenv.isFreeBSD || stdenv.isDarwin)
+    ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
+    ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin)
       [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ]
-    ++ optional stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+    ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
-  NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
+  NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
 
-  preBuild = optionalString stdenv.isDarwin ''
+  preBuild = lib.optionalString stdenv.isDarwin ''
     # resolve "extra qualification on member" error
     sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \
       src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -196,44 +213,19 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm -rf $out/tests
+  ''
+  # I don't know why it does not install qmake
+  + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    cp bin/qmake* $out/bin
   '';
 
-  crossAttrs = {
-    # I've not tried any case other than i686-pc-mingw32.
-    # -nomake tools:   it fails linking some asian language symbols
-    # -no-svg: it fails to build on mingw64
-    configureFlags = ''
-      -static -release -confirm-license -opensource
-      -no-opengl -no-phonon
-      -no-svg
-      -make qmake -make libs -nomake tools
-      -nomake demos -nomake examples -nomake docs
-    '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6";
-    patches = [];
-    preConfigure = ''
-      sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
-        -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
-        -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
-        -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
-        -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
-        mkspecs/win32-g++/qmake.conf
-    '';
-
-    # I don't know why it does not install qmake
-    postInstall = ''
-      cp bin/qmake* $out/bin
-    '';
-    configurePlatforms = [];
-    dontStrip = true;
-  } // optionalAttrs hostPlatform.isMinGW {
-    propagatedBuildInputs = [ ];
-  };
+  dontStrip = if stdenv.hostPlatform == stdenv.buildPlatform then null else true;
 
   meta = {
     homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
-    license     = licenses.lgpl21Plus; # or gpl3
-    maintainers = with maintainers; [ orivej lovek323 phreedom sander ];
-    platforms   = platforms.unix;
+    license     = lib.licenses.lgpl21Plus; # or gpl3
+    maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
+    platforms   = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 29cc477a279..b3f5e12b0ec 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.6.0.1";
+  version = "2.6.4.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,18 +11,21 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/skalibs";
     rev = "refs/tags/v${version}";
-    sha256 = "0skdv3wff1i78hb0y771apw0cak5rzxbwbh6l922snfm01z9k1ws";
+    sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
   };
 
+  outputs = [ "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-force-devr"       # assume /dev/random works
-    "--libdir=\${prefix}/lib"
-    "--includedir=\${prefix}/include"
-    "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--includedir=\${dev}/include"
+    "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   # On darwin, the target triplet from -dumpmachine includes version number, but
@@ -32,12 +35,17 @@ in stdenv.mkDerivation rec {
   # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/skalibs
+    mv doc $doc/share/doc/skalibs/html
+  '';
+
   meta = {
     homepage = http://skarnet.org/software/skalibs/;
     description = "A set of general-purpose C programming libraries";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix
new file mode 100644
index 00000000000..6e30825cfb3
--- /dev/null
+++ b/pkgs/development/libraries/soil/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip, mesa_noglu, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "soil";
+
+  src = fetchurl {
+    url    = "http://www.lonesock.net/files/soil.zip";
+    sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52";
+  };
+
+  buildInputs = [ unzip mesa_noglu libX11 ];
+  
+  sourceRoot = "Simple OpenGL Image Library/projects/makefile";
+  preBuild   = "mkdir obj";
+  preInstall = "mkdir -p $out/lib $out/include";
+  makeFlags  = [ "LOCAL=$(out)" ];
+
+  meta = {
+    description     = "Simple OpenGL Image Library";
+    longDescription = ''
+      SOIL is a tiny C library used primarily for uploading textures
+      into OpenGL.
+    '';
+    homepage  = https://www.lonesock.net/soil.html;
+    license   = stdenv.lib.licenses.publicDomain;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 333a37ba85d..79bebd87dbc 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -2,23 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "zeromq-${version}";
-  version = "4.2.3";
+  version = "4.2.5";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "libzmq";
     rev = "v${version}";
-    sha256 = "1yadf4vz4m49lpwwwscxs6wf4v9dgqgxkwgwpby9lvb4pv8qbmaf";
+    sha256 = "18mjmbhvfhr4463dqayl5hdjfy5rx7na1xsq9dsvlaz9qlr5fskw";
   };
 
   nativeBuildInputs = [ cmake asciidoc ];
 
   enableParallelBuilding = true;
 
-  postPatch = ''
-    sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
-  '';
-
   doCheck = false; # fails all the tests (ctest)
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index a05d49245b2..7db07e77d84 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -33,8 +33,9 @@ rec {
   };
 
   base = janePackage {
+    version = "0.11.1";
     name = "base";
-    hash = "0ad5xcyds2lwy9dk7gqwygxk5y769ckrgrjcykdalwdh8qfbi6nf";
+    hash = "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir";
     propagatedBuildInputs = [ sexplib0 ];
     meta.description = "Full standard library replacement for OCaml";
   };
diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
new file mode 100644
index 00000000000..39b0c53e0e9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml-migrate-parsetree }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "ppx_gen_rec";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ];
+
+  buildPhase = "jbuilder build -p ppx_gen_rec";
+
+  inherit (jbuilder) installPhase;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-ppx_gen_rec;
+    description = "ocaml preprocessor that generates a recursive module";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.frontsideair ];
+  };
+}
diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index f48310ceebc..b95ed080e66 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, attrs, click }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, attrs, click, toml, appdirs
+, glibcLocales, pytest }:
 
 buildPythonPackage rec {
   pname = "black";
-  version = "18.4a0";
+  version = "18.6b4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04dffr4wmzs4vf2xj0cxp03hv04x0kk06qyzx6jjrp1mq0z3n2rr";
+    sha256 = "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592";
   };
 
-  propagatedBuildInputs = [ attrs click ];
+  checkInputs =  [ pytest glibcLocales ];
+
+  checkPhase = ''
+    # no idea, why those fail.
+    LC_ALL="en_US.UTF-8" HOME="$NIX_BUILD_TOP" \
+      pytest \
+        -k "not test_cache_multiple_files and not test_failed_formatting_does_not_get_cached"
+  '';
+
+  propagatedBuildInputs = [ attrs appdirs click toml ];
 
   meta = with stdenv.lib; {
     description = "The uncompromising Python code formatter";
diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
new file mode 100644
index 00000000000..b4c2767f9dd
--- /dev/null
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage,
+  lxml, tzlocal, python-dateutil, pygments, future, requests-kerberos,
+  defusedxml, cached-property, isodate, requests_ntlm, dnspython,
+  psutil, requests-mock, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "exchangelib";
+  version = "1.11.4";
+
+  # tests are not present in the PyPI version
+  src = fetchFromGitHub {
+    owner = "ecederstrand";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1fpbnjnmqm62vll3m2ys1naikch70kqm26hz86f1cl0r2l2afbab";
+  };
+
+  # one test is failing due to it trying to send a request to example.com
+  patches = [ ./skip_failing_test.patch ];
+  checkInputs = [ psutil requests-mock pyyaml ];
+  propagatedBuildInputs = [
+    lxml tzlocal python-dateutil pygments requests-kerberos
+    future defusedxml cached-property isodate requests_ntlm dnspython ];
+
+  meta = with stdenv.lib; {
+    description = "Client for Microsoft Exchange Web Services (EWS)";
+    homepage    = "https://github.com/ecederstrand/exchangelib";
+    license     = licenses.bsd2;
+    maintainers = with maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/development/python-modules/exchangelib/skip_failing_test.patch b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
new file mode 100644
index 00000000000..6c070acaf75
--- /dev/null
+++ b/pkgs/development/python-modules/exchangelib/skip_failing_test.patch
@@ -0,0 +1,18 @@
+--- ./tests/__init__.py	1980-01-02 00:00:00.000000000 +0000
++++ ./tests/__init__.py	1980-01-02 00:00:00.000000000 +0000
+@@ -301,6 +301,7 @@
+             self.assertEqual(id(base_p.thread_pool), id(p.thread_pool))
+             self.assertEqual(id(base_p._session_pool), id(p._session_pool))
+ 
++    @unittest.skip("no network connection inside the Nix sandbox")
+     def test_close(self):
+         proc = psutil.Process()
+         ip_addresses = {info[4][0] for info in socket.getaddrinfo(
+@@ -1257,6 +1258,7 @@
+         )
+ 
+ 
++@unittest.skip("no network connection inside the Nix sandbox")
+ class EWSTest(unittest.TestCase):
+     @classmethod
+     def setUpClass(cls):
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 88705962627..6701c5a5b7e 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -20,9 +20,9 @@ buildPythonPackage rec {
     sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
   };
 
-  checkInputs = [ pytest pytest_xdist flaky mock ];
   propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
 
+  checkInputs = [ pytest pytest_xdist flaky mock ];
   inherit doCheck;
 
   # https://github.com/DRMacIver/hypothesis/issues/300
diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix
new file mode 100644
index 00000000000..7ee73975272
--- /dev/null
+++ b/pkgs/development/python-modules/pykerberos/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, krb5 }:
+
+buildPythonPackage rec {
+  pname = "pykerberos";
+  version = "1.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag";
+  };
+
+  buildInputs = [ krb5 ];
+
+  # there are no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "High-level interface to Kerberos";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix
index 508104d3312..c7787a42691 100644
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/pkgs/development/python-modules/pyserial/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = "python -m unittest discover -s test";
-  doInstallCheck = !hostPlatform.isDarwin; # broken on darwin
+  doCheck = !hostPlatform.isDarwin; # broken on darwin
 
   meta = with lib; {
     homepage = "https://github.com/pyserial/pyserial";
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 101594750fd..1d7447293df 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = ''
-    pytest .
+    pytest . -k "not test_mtime_caching"
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index b5a8cc252b9..1c0ceef8365 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
-, atomicwrites, mock
+, atomicwrites, mock, writeText
 }:
 buildPythonPackage rec {
   version = "3.6.2";
@@ -27,6 +27,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
+  # Don't create .pytest-cache when using py.test in a Nix build
+  setupHook = writeText "pytest-hook" ''
+    export PYTEST_ADDOPTS="-p no:cacheprovider"
+  '';
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
     platforms = platforms.unix;
diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix
new file mode 100644
index 00000000000..ab0758a84e1
--- /dev/null
+++ b/pkgs/development/python-modules/requests-kerberos/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pykerberos, mock }:
+
+buildPythonPackage rec {
+  pname = "requests-kerberos";
+  version = "0.12.0";
+
+  # tests are not present in the PyPI version
+  src = fetchFromGitHub {
+    owner = "requests";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1qw96aw84nljh9cip372mfv50p1yyirfgigavvavgpc3c5g278s6";
+  };
+
+  checkInputs = [ mock ];
+  propagatedBuildInputs = [ requests pykerberos ];
+
+  # they have a setup.py which mentions a test suite that doesn't exist...
+  patches = [ ./fix_setup.patch ];
+
+  meta = with stdenv.lib; {
+    description = "An authentication handler for using Kerberos with Python Requests.";
+    homepage    = "https://github.com/requests/requests-kerberos";
+    license     = licenses.isc;
+    maintainers = with maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/development/python-modules/requests-kerberos/fix_setup.patch b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
new file mode 100644
index 00000000000..67cc3a60f77
--- /dev/null
+++ b/pkgs/development/python-modules/requests-kerberos/fix_setup.patch
@@ -0,0 +1,9 @@
+--- ./setup.py	1980-01-02 00:00:00.000000000 +0000
++++ ./setup.py	1980-01-02 00:00:00.000000000 +0000
+@@ -56,6 +56,5 @@
+         ':sys_platform=="win32"': ['winkerberos>=0.5.0'],
+         ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
+     },
+-    test_suite='test_requests_kerberos',
+     tests_require=['mock'],
+ )
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix
new file mode 100644
index 00000000000..60a5308d718
--- /dev/null
+++ b/pkgs/development/python-modules/rfc7464/default.nix
@@ -0,0 +1,19 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "rfc7464";
+  version = "17.7.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hcn6h38qplfcmq392cs58r01k16k202bqyap4br02376pr4ik7a";
+    extension = "zip";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/moshez/rfc7464;
+    description = "RFC 7464 is a proposed standard for streaming JSON documents.";
+    license = [ licenses.mit ];
+    maintainers = with maintainers; [ shlevy ];
+  };
+}
diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix
new file mode 100644
index 00000000000..7c82e22efd6
--- /dev/null
+++ b/pkgs/development/python-modules/sabyenc/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "sabyenc";
+  version = "3.3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85";
+  };
+
+  # tests are not included in pypi distribution
+  doCheck = false;
+
+  meta = {
+    description = "Python yEnc package optimized for use within SABnzbd";
+    homepage = "https://github.com/sabnzbd/sabyenc/";
+    license = lib.licenses.lgpl3;
+    maintainers = [ lib.maintainers.georgewhewell ];
+  };
+
+}
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index c642039d4fe..592182d8b31 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "salmon-mail";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "452557172901d6227a325bbc72fcf61002a53c2342d935457b729303dce71f7e";
+    sha256 = "1p4cv99jaszhfam9qj6parij94n7yzwz4bawfl9qh5syx77wkxg2";
   };
 
   checkInputs = [ nose jinja2 mock ];
diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
new file mode 100644
index 00000000000..39e3d7fb3fa
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pkgconfig
+, gtk3
+, libjpeg
+, libtiff
+, SDL
+, gst-plugins-base
+, libnotify
+, freeglut
+, xorg
+, which
+}:
+
+buildPythonPackage rec {
+  pname = "wxPython";
+  version = "4.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8d0dfc0146c24749ce00d575e35cc2826372e809d5bc4a57bde6c89031b59e75";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    gtk3 libjpeg libtiff SDL gst-plugins-base libnotify freeglut xorg.libSM
+    which
+  ];
+
+
+  meta = {
+    description = "Cross platform GUI toolkit for Python, Phoenix version";
+    homepage = http://wxpython.org/;
+    license = lib.licenses.wxWindows;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 3c355d08576..9d4f5679e26 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -206,6 +206,13 @@ in
     buildFlags = [ "--with-system-v8=true" ];
   };
 
+  libxml-ruby = attrs: {
+    buildFlags = [
+      "--with-xml2-lib=${libxml2.out}/lib"
+      "--with-xml2-include=${libxml2.dev}/include/libxml2"
+    ];
+  };
+
   msgpack = attrs: {
     buildInputs = [ libmsgpack ];
   };
@@ -395,4 +402,8 @@ in
     '';
   };
 
+   zookeeper = attrs: {
+     buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
+   };
+
 }
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 70e476c4572..481247a41c4 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.76.0";
+  version = "0.77.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6";
+    sha256 = "1wcbqw5vwb3wsz9dkhi2k159ms98kn1nw3g9lc2j9w1m8ki41lql";
   };
 
   installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libelf
   ] ++ (with ocamlPackages; [
-    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
+    ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx ppx_deriving ppx_gen_rec lwt_log wtf8 dtoa
   ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index b59a93d3732..56b64cd061b 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -26,7 +26,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  version = "0.15.1";
+  version = "0.15.2";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6";
+    sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz";
   };
 
   sourceRoot = ".";
@@ -128,10 +128,10 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     export TMPDIR=/tmp/.bazel-$UID
     ./compile.sh
-    ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
-      --spawn_strategy=standalone \
-      --genrule_strategy=standalone
-    cp bazel-bin/scripts/bazel-complete.bash output/
+    scripts/generate_bash_completion.sh \
+        --bazel=./output/bazel \
+        --output=output/bazel-complete.bash \
+        --prepend=scripts/bazel-complete-template.bash
   '';
 
   # Build the CPP and Java examples to verify that Bazel works.
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
     mv output/bazel $out/bin
     wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
-    mv output/bazel-complete.bash $out/share/bash-completion/completions/
+    mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 2ccd6637d08..3cb906d50ed 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -2,12 +2,12 @@
   targetPrefix = lib.optionalString stdenv.isCross
                    (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
-  version = "0.47.0";
+  version = "0.46.1";
   pname = "meson";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6";
+    sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
   };
 
   postFixup = ''
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 22c2f077418..3ce9e64c0f7 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "cloudfoundry-cli-${version}";
-  version = "6.36.1";
+  version = "6.37.0";
 
   goPackagePath = "code.cloudfoundry.org/cli";
 
@@ -12,17 +12,18 @@ buildGoPackage rec {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "19inl7qs2acs59p3gnl5zdsxym0wp2rn05q0zfg7rwf5sjh68amp";
+    sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv";
   };
 
   outputs = [ "out" ];
 
-  buildFlagsArray = ''
-    -ldflags= -X ${goPackagePath}/version.binaryVersion=${version}
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    CF_BUILD_DATE="1970-01-01" make build
   '';
 
   installPhase = ''
-    install -Dm555 go/bin/cli "$out/bin/cf"
+    install -Dm555 out/cf "$out/bin/cf"
     remove-references-to -t ${go} "$out/bin/cf"
     install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
   '';
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index 0d4f72fad80..283193a485c 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "dep-${version}";
-  version = "0.4.1";
+  version = "0.5.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/golang/dep";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "golang";
     repo = "dep";
-    sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y";
+    sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j";
   };
 
   buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
@@ -22,6 +22,6 @@ buildGoPackage rec {
     description = "Go dependency management tool";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = [ maintainers.carlsverre ];
+    maintainers = with maintainers; [ carlsverre rvolosatovs ];
   };
 }
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
new file mode 100644
index 00000000000..4f9512b2213
--- /dev/null
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -0,0 +1,28 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kustomize-${version}";
+  version = "1.0.4";
+
+  goPackagePath = "github.com/kubernetes-sigs/kustomize";
+
+  src = fetchFromGitHub {
+    sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm";
+    rev = "v${version}";
+    repo = "kustomize";
+    owner = "kubernetes-sigs";
+  };
+
+  meta = with lib; {
+    description = "Customization of kubernetes YAML configurations";
+    longDescription = ''
+      kustomize lets you customize raw, template-free YAML files for
+      multiple purposes, leaving the original YAML untouched and usable
+      as is.
+    '';
+    homepage = https://github.com/kubernetes-sigs/kustomize;
+    license = licenses.asl20;
+    maintainers = [ maintainers.carlosdagos ];
+  };
+}
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 2bd12b409f1..62c7cf3d877 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "circleci-cli";
-  version = "2018-05-12";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "circleci";
     repo = "local-cli";
-    rev = "2c7c1a74e3c3ffb8eebc03fccd782b1bfe9e940a";
-    sha256 = "0fp0fz0xr7ynp32lqcmaigl9p45wk1hd2gv9i5q5bj9syj3g7qzm";
+    rev = "v${version}";
+    sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 2ee573e4ba1..af140bfb1d6 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -28,46 +28,40 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
+  # This program does not cross-build fine. So I only cross-build some parts
+  # I need for the linux perf tool.
+  # On the awful cross-building:
+  # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
+  #
+  # I wrote this testing for the nanonote.
 
-    /* Having bzip2 will harm, because anything using elfutils
-       as buildInput cross-building, will not be able to run 'bzip2' */
-    propagatedBuildInputs = [ zlib.crossDrv ];
+  buildPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
+    pushd libebl
+    make
+    popd
+    pushd libelf
+    make
+    popd
+    pushd libdwfl
+    make
+    popd
+    pushd libdw
+    make
+    popd
+  '';
 
-    # This program does not cross-build fine. So I only cross-build some parts
-    # I need for the linux perf tool.
-    # On the awful cross-building:
-    # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
-    #
-    # I wrote this testing for the nanonote.
-    buildPhase = ''
-      pushd libebl
-      make
-      popd
-      pushd libelf
-      make
-      popd
-      pushd libdwfl
-      make
-      popd
-      pushd libdw
-      make
-      popd
-    '';
-
-    installPhase = ''
-      pushd libelf
-      make install
-      popd
-      pushd libdwfl
-      make install
-      popd
-      pushd libdw
-      make install
-      popd
-      cp version.h $out/include
-    '';
-  };
+  installPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
+    pushd libelf
+    make install
+    popd
+    pushd libdwfl
+    make install
+    popd
+    pushd libdw
+    make install
+    popd
+    cp version.h $out/include
+  '';
 
   meta = {
     homepage = https://sourceware.org/elfutils/;
diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix
index 17620c9df6c..1fd52f43557 100644
--- a/pkgs/development/tools/misc/kibana/6.x.nix
+++ b/pkgs/development/tools/misc/kibana/6.x.nix
@@ -1,4 +1,13 @@
-{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }:
+{ elk6Version
+, enableUnfree ? true
+, stdenv
+, makeWrapper
+, fetchzip
+, fetchurl
+, nodejs
+, coreutils
+, which
+}:
 
 with stdenv.lib;
 let
@@ -6,12 +15,31 @@ let
   info = splitString "-" stdenv.system;
   arch = elemAt info 0;
   plat = elemAt info 1;
-  shas = {
-    "x86_64-linux"  = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk";
-    "x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii";
+  shas =
+    if enableUnfree
+    then {
+      "x86_64-linux"  = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
+      "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
+    }
+    else {
+      "x86_64-linux"  = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
+      "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
+    };
+
+  # For the correct phantomjs version see:
+  # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js
+  phantomjs = rec {
+    name = "phantomjs-${version}-linux-x86_64";
+    version = "2.1.1";
+    src = fetchzip {
+      inherit name;
+      url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2";
+      sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv";
+    };
   };
+
 in stdenv.mkDerivation rec {
-  name = "kibana-${version}";
+  name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
   version = elk6Version;
 
   src = fetchurl {
@@ -28,12 +56,19 @@ in stdenv.mkDerivation rec {
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
       --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
     sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
+  '' +
+  # phantomjs is needed in the unfree version. When phantomjs doesn't exist in
+  # $out/libexec/kibana/data kibana will try to download and unpack it during
+  # runtime which will fail because the nix store is read-only. So we make sure
+  # it already exist in the nix store.
+  optionalString enableUnfree ''
+    ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name}
   '';
 
   meta = {
     description = "Visualize logs and time-stamped data";
     homepage = http://www.elasticsearch.org/overview/kibana;
-    license = licenses.asl20;
+    license = if enableUnfree then licenses.elastic else licenses.asl20;
     maintainers = with maintainers; [ offline rickynils basvandijk ];
     platforms = with platforms; unix;
   };
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 2eb9b453661..c0e12aa22c4 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "ycmd-${version}";
-  version = "2018-06-14";
+  version = "2018-07-24";
 
   src = fetchgit {
     url = "https://github.com/Valloric/ycmd.git";
-    rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
-    sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
+    rev = "f8a8b04892b925efeee24298a957cc6d6a69ad06";
+    sha256 = "1br2sh6bs0fg1axq2hq9f48fz8klkzydi1mf0j0jdsh3zjzkmxbn";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
 
-    for p in jedi waitress frozendict bottle python-future requests; do
+    for p in jedi waitress frozendict bottle parso python-future requests; do
       cp -r third_party/$p $out/lib/ycmd/third_party
     done
 
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index 4f78b0c71c1..1062a361413 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ m4 ];
 
-  crossAttrs = {
-    preConfigure = ''
-      export ac_cv_func_malloc_0_nonnull=yes
-      export ac_cv_func_realloc_0_nonnull=yes
-    '';
-  };
+  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
 
   meta = {
     branch = "2.5.35";
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index f27fac9bcb5..954c2bbcb24 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -12,22 +12,19 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ m4 ];
 
+  preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
+  ];
+
   postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 
-  crossAttrs = {
-
-    # disable tests which can't run on build machine
-    postPatch = ''
-      substituteInPlace Makefile.in --replace "tests" " ";
-    '';
-
-    preConfigure = ''
-      export ac_cv_func_malloc_0_nonnull=yes
-      export ac_cv_func_realloc_0_nonnull=yes
-    '';
-  };
+  # disable tests which can't run on build machine
+  postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    substituteInPlace Makefile.in --replace "tests" " ";
+  '';
 
   meta = {
     homepage = https://github.com/westes/flex;
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
new file mode 100644
index 00000000000..da510e5251b
--- /dev/null
+++ b/pkgs/development/tools/pet/default.nix
@@ -0,0 +1,25 @@
+{ buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  name = "pet-${version}";
+  version = "0.3.2";
+
+  goPackagePath = "github.com/knqyf263/pet";
+
+  src = fetchFromGitHub {
+    owner = "knqyf263";
+    repo = "pet";
+    rev = "v${version}";
+    sha256 = "1zv2jfgh5nqd4cwr1ljm5p4rqam7hq3a6asfmhr3lcnp7sz9b8fr";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Simple command-line snippet manager, written in Go";
+    homepage = https://github.com/knqyf263/pet;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/pet/deps.nix b/pkgs/development/tools/pet/deps.nix
new file mode 100644
index 00000000000..b8a20f58576
--- /dev/null
+++ b/pkgs/development/tools/pet/deps.nix
@@ -0,0 +1,155 @@
+[
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+    };
+  }
+  {
+    goPackagePath = "github.com/briandowns/spinner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/briandowns/spinner";
+      rev = "5b875a9171af19dbde37e70a8fcbe2ebd7285e05";
+      sha256 = "0vq78qmg07dm9vnjqz17ca9qml8np7f9vj9igsira7a39xg09ivg";
+    };
+  }
+  {
+    goPackagePath = "github.com/chzyer/readline";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chzyer/readline";
+      rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
+      sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "2d684516a8861da43017284349b7e303e809ac21";
+      sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-github";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-github";
+      rev = "c0b63e2f9bb198baf328c8abf1ddcbe05ff9427e";
+      sha256 = "1a4skdbzxnyj3irqrmhhj4c9cimga0k5sd0vykjfqj7c8c5bwbd5";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
+      sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
+    };
+  }
+  {
+    goPackagePath = "github.com/jroimartin/gocui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jroimartin/gocui";
+      rev = "c055c87ae801372cd74a0839b972db4f7697ae5f";
+      sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3";
+      sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "a114f312e075f65bf30d6d9a1430113f857e543b";
+      sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+    };
+  }
+  {
+    goPackagePath = "github.com/xanzy/go-gitlab";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xanzy/go-gitlab";
+      rev = "696e3cf592c0f71a0fce1934ad500376abe2e12d";
+      sha256 = "1wjn991i161z4xqply3lxvvjgnisdrbkiadr0h0n01k40hymdx6h";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
+      sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
+      sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "ef147856a6ddbb60760db74283d2424e98c87bff";
+      sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+      sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+    };
+  }
+]
diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix
new file mode 100644
index 00000000000..b6ba02633ac
--- /dev/null
+++ b/pkgs/development/tools/rshell/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }:
+
+buildPythonApplication rec {
+  pname = "rshell";
+  version = "0.0.14";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g";
+  };
+
+  propagatedBuildInputs = [ pyserial pyudev ];
+
+  meta = with lib; {
+    homepage = https://github.com/dhylands/rshell;
+    description = "Remote Shell for MicroPython";
+    license = licenses.mit;
+    maintainers = with maintainers; [ c0deaddict ];
+  };
+}
diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index d6185d79f1d..6215bed77cf 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -2,21 +2,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    jaro_winkler (1.5.1)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.1)
-    rubocop (0.55.0)
+    rubocop (0.58.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -26,4 +28,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.14.6
+   1.16.1
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index a2585a6e4f6..7478cd568bd 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -7,6 +7,14 @@
     };
     version = "2.4.0";
   };
+  jaro_winkler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   parallel = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -19,18 +27,18 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
       type = "gem";
     };
-    version = "2.5.1.0";
+    version = "2.5.1.2";
   };
   powerpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.1.2";
   };
   rainbow = {
     source = {
@@ -49,13 +57,13 @@
     version = "12.3.1";
   };
   rubocop = {
-    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11";
+      sha256 = "0s2qlrdx2f7653kmzwm58c8izyvgyjrzjrz76l2b005f2816kji6";
       type = "gem";
     };
-    version = "0.55.0";
+    version = "0.58.1";
   };
   ruby-progressbar = {
     source = {
@@ -68,9 +76,9 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
index 4d77cf45d41..60f29fccdc3 100644
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@@ -4,29 +4,26 @@ Date: Sat, 28 Oct 2017 17:58:17 +0200
 Subject: [PATCH] nix customization: patchelf installed binaries
 
 ---
- src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
+ src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
-index 8aa63db9..4d219826 100644
+index 70c54dcd..f0318986 100644
 --- a/src/rustup-dist/src/component/package.rs
 +++ b/src/rustup-dist/src/component/package.rs
-@@ -99,7 +99,13 @@ impl Package for DirectoryPackage {
+@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
              let src_path = root.join(&path);
  
              match &*part.0 {
--                "file" => try!(builder.copy_file(path.clone(), &src_path)),
+-                "file" => builder.copy_file(path.clone(), &src_path)?,
 +                "file" => {
-+                    try!(builder.copy_file(path.clone(), &src_path));
-+                    nix_patchelf_if_needed(
-+                        &target.prefix().path().join(path.clone()),
-+                        &src_path,
-+                    )
++                    builder.copy_file(path.clone(), &src_path)?;
++                    nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
 +                }
-                 "dir" => try!(builder.copy_dir(path.clone(), &src_path)),
+                 "dir" => builder.copy_dir(path.clone(), &src_path)?,
                  _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
              }
-@@ -117,6 +123,22 @@ impl Package for DirectoryPackage {
+@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
      }
  }
  
@@ -50,5 +47,5 @@ index 8aa63db9..4d219826 100644
  // binaries are executable and directories readable. This shouldn't be
  // necessary: the source files *should* have the right permissions,
 -- 
-2.14.1
+2.17.1
 
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 65a4a05633c..fd6dbc7aeaa 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "1.11.0";
-
-  cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustup.rs";
     rev = version;
-    sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz";
+    sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
   };
 
+  cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
+
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
@@ -32,10 +32,12 @@ rustPlatform.buildRustPackage rec {
     '')
   ];
 
+  doCheck = !stdenv.isAarch64;
+
   postInstall = ''
     pushd $out/bin
     mv rustup-init rustup
-    for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do
+    for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt cargo-clippy; do
       ln -s rustup $link
     done
     popd
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index dc157b67253..48f9822ad86 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -28,7 +28,7 @@ buildGoPackage rec {
   excludedPackages = "integration";
 
   nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
-  buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
+  buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
 
   buildFlagsArray = ''
     -ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
   '';
 
   preBuild = ''
-    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
-    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
+    export CGO_CFLAGS="$CFLAGS"
+    export CGO_LDFLAGS="$LDFLAGS"
   '';
 
   postBuild = ''
diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix
new file mode 100644
index 00000000000..460fc049c7b
--- /dev/null
+++ b/pkgs/games/arena/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk_pixbuf, libX11 }:
+
+# Arena is free software in the sense of "free beer" but not as in "free
+# speech". We can install it as we please, but we cannot re-distribute it in
+# any way other than the original release tarball, so we cannot include its NAR
+# into the Nixpkgs channel.
+
+let
+
+  inherit (stdenv.lib) makeLibraryPath;
+  libDir = "lib64";
+
+in
+stdenv.mkDerivation rec {
+  name = "arena-1.1";
+
+  src = fetchurl {
+    url = http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz;
+    sha256 = "1sh71v5ymzwflq8ycx9j9kl0jhqllgs6z24h4h8j5z8pwdh528v6";
+  };
+
+  # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
+  buildInputs = [gtk2-x11 glib pango cairo atk gdk_pixbuf libX11 stdenv.cc.cc.lib];
+
+  unpackPhase = ''
+    # This is is a tar bomb, i.e. it extract a dozen files and directories to
+    # the top-level, so we must create a sub-directory first.
+    mkdir -p $out/lib/${name}
+    tar -C $out/lib/${name} -xf ${src}
+
+    # Remove executable bits from data files. This matters for the find command
+    # we'll use below to find all bundled engines.
+    chmod -x $out/lib/${name}/Engines/*/*.{txt,bin,bmp}
+  '';
+
+  buildPhase = ''
+    # Arena has (at least) two executables plus a couple of bundled chess
+    # engines that we need to patch.
+    exes=( $(find $out -name '*x86_64_linux')
+           $(find $out/lib/${name}/Engines -type f -perm /u+x)
+         )
+    for i in "''${exes[@]}"; do
+      # Arminius is statically linked.
+      if [[ $i =~ "Arminius_2017-01-01" ]]; then echo yo $i; continue; fi
+      echo Fixing interpreter and rpath paths in $i ...
+      patchelf                                                                                   \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"                                \
+        --set-rpath ${makeLibraryPath buildInputs}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir}  \
+        $i
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s $out/lib/${name}/Arena_x86_64_linux $out/bin/arena
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    description = "Chess GUI for analyzing with and playing against various engines";
+    longDescription = ''
+      A free Graphical User Interface (GUI) for chess. Arena assists you in
+      analyzing and playing games as well as in testing chess engines. It runs
+      on Linux or Windows. Arena is compatible to Winboard protocol I, II and
+      UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic
+      chess board & DGT clocks and much more.
+    '';
+    license = stdenv.lib.licenses.unfree;
+    platforms = ["x86_64-linux"];
+    hydraPlatforms = stdenv.lib.platforms.none;
+  };
+
+}
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index e59181bb0fa..76edc512b0e 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,11 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
-, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, openjdk
-, libGLU_combined, openal
-, useAlsa ? false, alsaOss ? null }:
-with stdenv.lib;
-
-assert useAlsa -> alsaOss != null;
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, jdk, jre, libpulseaudio
+}:
 
 let
   desktopItem = makeDesktopItem {
@@ -19,41 +14,33 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "minecraft-2015.07.24";
+  name = "minecraft-2015-07-24";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
     sha256 = "04pj4l5q0a64jncm2kk45r7nxnxa2z9n110dcxbbahdi6wk0png8";
   };
 
-  phases = "installPhase";
-
-  installPhase = ''
-    set -x
-    mkdir -pv $out/bin
-    cp -v $src $out/minecraft.jar
+  nativeBuildInputs = [ makeWrapper ];
 
-    cat > $out/bin/minecraft << EOF
-    #!${stdenv.shell}
+  unpackPhase = "${jdk}/bin/jar xf $src favicon.png";
 
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libGLU_combined openal ]}
-    ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
-      ${jre}/bin/java -jar $out/minecraft.jar
-    EOF
-
-    chmod +x $out/bin/minecraft
+  installPhase = ''
+    mkdir -p $out/bin $out/share/minecraft
 
-    mkdir -p $out/share/applications
-    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+    makeWrapper ${jre}/bin/java $out/bin/minecraft \
+      --add-flags "-jar $out/share/minecraft/minecraft.jar" \
+      --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
 
-    ${openjdk}/bin/jar xf $out/minecraft.jar favicon.png
+    cp $src $out/share/minecraft/minecraft.jar
+    cp -r ${desktopItem}/share/applications $out/share
     install -D favicon.png $out/share/icons/hicolor/32x32/apps/minecraft.png
   '';
 
-  meta = {
-      description = "A sandbox-building game";
-      homepage = http://www.minecraft.net;
-      maintainers = with stdenv.lib.maintainers; [ cpages ryantm ];
-      license = stdenv.lib.licenses.unfreeRedistributable;
+  meta = with stdenv.lib; {
+    description = "A sandbox-building game";
+    homepage = https://minecraft.net;
+    maintainers = with maintainers; [ cpages ryantm infinisil ];
+    license = licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix
index 4babc1caea5..520f6503edf 100644
--- a/pkgs/games/prboom/default.nix
+++ b/pkgs/games/prboom/default.nix
@@ -1,20 +1,31 @@
-{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}:
+{ stdenv, fetchurl, SDL, SDL_mixer, SDL_net
+, libGLU_combined ? assert false; null
+, useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "prboom-2.5.0";
   src = fetchurl {
     url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz;
     sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12";
   };
 
-  buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ];
-  crossAttrs = {
-    propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ];
-    configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest
-      ac_cv_type_uid_t=yes ac_cv_type_gid_t=yes";
+  buildInputs = [ SDL SDL_mixer SDL_net ]
+    ++ stdenv.lib.optional useOpenGL libGLU_combined;
 
-    postInstall = ''
-      mv $out/games/ $out/bin
-    '';
-  };
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+
+  configureFlags = [
+    (stdenv.lib.enableFeature useOpenGL "gl")
+    (stdenv.lib.enableFeature doCheck "sdltest")
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--disable-cpu-opt"
+    "--without-x"
+    "ac_cv_type_uid_t=yes"
+    "ac_cv_type_gid_t=yes"
+  ];
+
+  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    mv $out/games/ $out/bin
+  '';
 }
diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix
new file mode 100644
index 00000000000..4c06926ed50
--- /dev/null
+++ b/pkgs/games/runelite/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
+
+  stdenv.mkDerivation rec {
+  name = "runelite-${version}";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar";
+    sha256 = "0q2xx0wrnlg5mrv8nnmnh300r8mqfm8k2p028m7mr09kn18xvkzx";
+  };
+
+  icon = fetchurl {
+    url = "https://github.com/runelite/runelite/raw/master/runelite-client/src/main/resources/runelite.png";
+    sha256 = "0fxzkpsin09giqp7h8z0plxznk5d5j60sv34v1lw61p7d5y2izvr";
+  };
+
+  desktop = makeDesktopItem {
+    name = "RuneLite";
+    type = "Application";
+    exec = "runelite";
+    icon = "${icon}";
+    comment = "Open source Old School RuneScape client";
+    terminal = "false";
+    desktopName = "RuneLite";
+    genericName = "Oldschool Runescape";
+    categories = "Application;Game";
+    startupNotify = null;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  # colon is bash form of no-op (do nothing)
+  unpackPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/share/runelite
+    mkdir -p $out/share/applications
+
+    ln -s ${src} $out/share/runelite/RuneLite.jar
+    ln -s ${desktop}/share/applications/* $out/share/applications
+
+    makeWrapper ${jre}/bin/java $out/bin/runelite \
+    --add-flags "-jar $out/share/runelite/RuneLite.jar"
+  '';
+
+  meta = {
+    description = "Open source Old School RuneScape client";
+    homepage = "https://runelite.net/";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.kmeakin ];
+    platforms = lib.platforms.all;
+  };
+  }
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index f4590081898..b9b95a5fb4d 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -20,22 +20,16 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  configurePlatforms = [ "host" ];
   configureFlags = [
     "--enable-c++11"
     "--enable-release"
   ];
 
-  crossAttrs = {
-    preConfigure = ''
-      # Remove the --build flag set by the gcc cross wrapper setup
-      # hook
-      export configureFlags="--host=${hostPlatform.config}"
-    '';
-    postConfigure = ''
-      # They use 'install -s', that calls the native strip instead of the cross
-      sed -i 's/-c -s/-c/' ports.mk;
-    '';
-  };
+  # They use 'install -s', that calls the native strip instead of the cross
+  postConfigure = ''
+    sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}" ports.mk
+  '';
 
   meta = with stdenv.lib; {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 159f1faf096..1f99af85f9f 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 let arch = if stdenv.isx86_64 then "x86-64" else
            if stdenv.isi686 then "x86-32" else
@@ -7,14 +7,13 @@ in
 
 stdenv.mkDerivation rec {
 
-  name = "stockfish-8";
+  name = "stockfish-9";
 
   src = fetchurl {
-    url = "https://stockfish.s3.amazonaws.com/${name}-src.zip";
-    sha256 = "1sachz41kbni88yjxwv5y4vl0gjbnyqvp1kpdm7v56k43zr3dbbv";
+    url = "https://github.com/official-stockfish/Stockfish/archive/sf_9.tar.gz";
+    sha256 = "1i37izc3sq9vr663iaxpfh008lgsw7abzj1ws5l1hf3b6xjkgwyh";
   };
 
-  buildInputs = [ unzip ];
   postUnpack = "sourceRoot+=/src";
   makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ];
   buildFlags = "build ";
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index ce911ae40d5..111bc449d88 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "194z3j9zwlbc6j97iy1m1cl0xqks3ws2bjp2xrgy8cwpi7fclaw2";
+        sha256 = "0ymg6y6v0mdhs1rs11fn33xdp3r6v85563z0f4p7s22j1kd3nd6r";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b52e6324199..b3dfed3d265 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -32,7 +32,7 @@ let
 # Documentation & usage see vim-utils.nix.
 # attribute names should be the same as used by vim-pi to make dependency
 # resolution work
-  self = rec {
+self = rec {
   # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
   # which recreates this the following derivations based on ./vim-plugin-names
   pluginnames2nix = vimUtils.pluginnames2Nix {
@@ -454,17 +454,6 @@ let
 
   };
 
-  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-07-19";
-    src = fetchgit {
-      url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "0f1921799644cd662cb0a3393ba71096e5e56115";
-      sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2";
-    };
-    dependencies = [];
-
-  };
-
   ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ultisnips-2018-04-30";
     src = fetchgit {
@@ -609,11 +598,11 @@ let
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2018-04-15";
+    name = "clighter8-2018-07-25";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "6d325abd043fd1bc31bea821f751996541bfc944";
-      sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq";
+      rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181";
+      sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg";
     };
     dependencies = [];
     preFixup = ''
@@ -623,11 +612,11 @@ let
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-07-16";
+    name = "neomake-2018-07-23";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "f26a31a315f60150fd42682df911306b4d795dd8";
-      sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w";
+      rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163";
+      sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0";
     };
     dependencies = [];
 
@@ -876,11 +865,11 @@ let
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-07-07";
+    name = "vim-2018-07-23";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33";
-      sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm";
+      rev = "d329d61c1752807059aef388c4e9629296760a35";
+      sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm";
     };
     dependencies = [];
 
@@ -920,11 +909,11 @@ let
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "editorconfig-vim-2017-10-14";
+    name = "editorconfig-vim-2018-07-25";
     src = fetchgit {
       url = "https://github.com/editorconfig/editorconfig-vim";
-      rev = "0abb0634a8bf3c760a283e9e7475594b83869a46";
-      sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21";
+      rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4";
+      sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x";
     };
     dependencies = [];
 
@@ -986,11 +975,11 @@ let
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2018-04-05";
+    name = "vim-localvimrc-2018-07-23";
     src = fetchgit {
       url = "https://github.com/embear/vim-localvimrc";
-      rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648";
-      sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja";
+      rev = "a3cb22a68625e022df1da402361801cc817bcec5";
+      sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc";
     };
     dependencies = [];
 
@@ -1041,16 +1030,30 @@ let
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-07-18";
+    name = "vim-go-2018-07-22";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b";
-      sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk";
+      rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585";
+      sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1";
     };
     dependencies = [];
 
   };
 
+  vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-isort-2017-03-12";
+    src = fetchgit {
+      url = "https://github.com/fisadev/vim-isort";
+      rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda";
+      sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m";
+    };
+    dependencies = [];
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';
+  };
+
   vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorschemes-2017-08-22";
     src = fetchgit {
@@ -1349,11 +1352,11 @@ let
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2017-11-17";
+    name = "vim-orgmode-2018-07-25";
     src = fetchgit {
       url = "https://github.com/jceb/vim-orgmode";
-      rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637";
-      sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9";
+      rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c";
+      sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx";
     };
     dependencies = [];
 
@@ -1371,11 +1374,11 @@ let
   };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2016-06-14";
+    name = "tslime-vim-2018-07-23";
     src = fetchgit {
       url = "https://github.com/jgdavey/tslime.vim";
-      rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
-      sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
+      rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0";
+      sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x";
     };
     dependencies = [];
 
@@ -1448,11 +1451,11 @@ let
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-07-11";
+    name = "fzf-vim-2018-07-22";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109";
-      sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj";
+      rev = "6ce58caad320be3cf9ff5d275191f88524edf326";
+      sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf";
     };
     dependencies = [];
 
@@ -1580,11 +1583,11 @@ let
   };
 
   swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "swift-vim-2018-04-20";
+    name = "swift-vim-2018-07-21";
     src = fetchgit {
       url = "https://github.com/keith/swift.vim";
-      rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996";
-      sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3";
+      rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab";
+      sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153";
     };
     dependencies = [];
 
@@ -1679,11 +1682,11 @@ let
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-07-13";
+    name = "vimtex-2018-07-25";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "e3dabe0a369dac556508ac5d1132979d654bc753";
-      sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2";
+      rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c";
+      sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n";
     };
     dependencies = [];
 
@@ -1870,22 +1873,22 @@ let
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2018-07-08";
+    name = "vim-signify-2018-07-25";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-signify";
-      rev = "9303070b022c4a642a8d35361e3680622c525144";
-      sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz";
+      rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc";
+      sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2018-07-03";
+    name = "vim-startify-2018-07-21";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde";
-      sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s";
+      rev = "8cde338d1f35057fd64146090c960a55b953dcd9";
+      sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29";
     };
     dependencies = [];
 
@@ -2094,11 +2097,11 @@ let
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2018-06-13";
+    name = "python-mode-2018-07-23";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6";
-      sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f";
+      rev = "d241974f40e8d206f9970e51fb0069951862ba35";
+      sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci";
     };
     dependencies = [];
 
@@ -2334,11 +2337,22 @@ let
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-07-19";
+    name = "denite-nvim-2018-07-22";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "0cab5543d755be4a6c9d331672b07235f8473f1f";
-      sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0";
+      rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8";
+      sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r";
+    };
+    dependencies = [];
+
+  };
+
+  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-nvim-2018-07-22";
+    src = fetchgit {
+      url = "https://github.com/shougo/deoplete.nvim";
+      rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73";
+      sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz";
     };
     dependencies = [];
 
@@ -2484,6 +2498,17 @@ let
     '';
   };
 
+  fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fugitive-gitlab-vim-2018-07-04";
+    src = fetchgit {
+      url = "https://github.com/shumphrey/fugitive-gitlab.vim";
+      rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838";
+      sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d";
+    };
+    dependencies = [];
+
+  };
+
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "gundo-vim-2017-05-09";
     src = fetchgit {
@@ -2495,6 +2520,17 @@ let
 
   };
 
+  splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "splice-vim-2017-09-03";
+    src = fetchgit {
+      url = "https://github.com/sjl/splice.vim";
+      rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
+      sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
+    };
+    dependencies = [];
+
+  };
+
   last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "last256-2017-06-11";
     src = fetchgit {
@@ -2660,6 +2696,17 @@ let
 
   };
 
+  vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-abolish-2017-03-10";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-abolish";
+      rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd";
+      sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m";
+    };
+    dependencies = [];
+
+  };
+
   vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-commentary-2018-07-11";
     src = fetchgit {
@@ -2672,11 +2719,11 @@ let
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-07-18";
+    name = "vim-dispatch-2018-07-25";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "43760f9d8469d59fd629a97e19dce4491192cca6";
-      sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90";
+      rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b";
+      sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh";
     };
     dependencies = [];
 
@@ -2693,12 +2740,23 @@ let
 
   };
 
+  vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-flagship-2018-07-24";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-flagship";
+      rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff";
+      sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f";
+    };
+    dependencies = [];
+
+  };
+
   vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fugitive-2018-07-18";
+    name = "vim-fugitive-2018-07-25";
     src = fetchgit {
       url = "https://github.com/tpope/vim-fugitive";
-      rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056";
-      sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz";
+      rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac";
+      sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v";
     };
     dependencies = [];
 
@@ -2715,6 +2773,17 @@ let
 
   };
 
+  vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-projectionist-2018-07-24";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-projectionist";
+      rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a";
+      sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz";
+    };
+    dependencies = [];
+
+  };
+
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-repeat-2018-07-02";
     src = fetchgit {
@@ -2727,11 +2796,22 @@ let
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-rhubarb-2018-07-19";
+    name = "vim-rhubarb-2018-07-21";
     src = fetchgit {
       url = "https://github.com/tpope/vim-rhubarb";
-      rev = "186bf27e05ab8713193b1d1210cd3c79f392445a";
-      sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv";
+      rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a";
+      sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9";
+    };
+    dependencies = [];
+
+  };
+
+  vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-scriptease-2018-07-18";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-scriptease";
+      rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300";
+      sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4";
     };
     dependencies = [];
 
@@ -2771,11 +2851,22 @@ let
   };
 
   vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-surround-2018-06-15";
+    name = "vim-surround-2018-07-23";
     src = fetchgit {
       url = "https://github.com/tpope/vim-surround";
-      rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce";
-      sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql";
+      rev = "597068870b8f093a8b2d11536c62ff31222ee8d0";
+      sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x";
+    };
+    dependencies = [];
+
+  };
+
+  vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-tbone-2018-06-27";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-tbone";
+      rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737";
+      sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4";
     };
     dependencies = [];
 
@@ -2848,11 +2939,11 @@ let
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-06-20";
+    name = "youcompleteme-2018-07-25";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b";
-      sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f";
+      rev = "15362d9cb8ec054c929e9a202252825eabe47e58";
+      sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy";
     };
     dependencies = [];
     buildPhase = ''
@@ -2874,11 +2965,11 @@ let
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-07-13";
+    name = "vim-airline-2018-07-24";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline";
-      rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2";
-      sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw";
+      rev = "59f3669a42728406da6d1b948608cae120d1453f";
+      sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025";
     };
     dependencies = [];
 
@@ -2896,11 +2987,11 @@ let
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2018-01-11";
+    name = "vim-pandoc-2018-07-23";
     src = fetchgit {
       url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "3a686781ab5ea622616798475deb394e48d3cc48";
-      sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3";
+      rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb";
+      sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk";
     };
     dependencies = [];
 
@@ -3127,33 +3218,33 @@ let
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2018-06-12";
+    name = "vimwiki-2018-07-21";
     src = fetchgit {
       url = "https://github.com/vimwiki/vimwiki";
-      rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90";
-      sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw";
+      rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4";
+      sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc";
     };
     dependencies = [];
 
   };
 
   dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dhall-vim-2018-07-15";
+    name = "dhall-vim-2018-07-23";
     src = fetchgit {
       url = "https://github.com/vmchale/dhall-vim";
-      rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae";
-      sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw";
+      rev = "5bdddb86e660f172841109a28e2a98efb76448ce";
+      sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq";
     };
     dependencies = [];
 
   };
 
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-07-17";
+    name = "ale-2018-07-25";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "5453e0e1a43302226da1d1d753e162af0231f9d3";
-      sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp";
+      rev = "79ffdde267323a206a96227904549c370f27decf";
+      sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg";
     };
     dependencies = [];
 
@@ -3259,7 +3350,7 @@ let
       sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9e7f70925a2..4d0e85e153c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -52,6 +52,7 @@
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:FelikZ/ctrlp-py-matcher"
+"github:fisadev/vim-isort"
 "github:flazz/vim-colorschemes"
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
@@ -194,7 +195,7 @@
 "github:sheerun/vim-polyglot"
 "github:shougo/context_filetype.vim"
 "github:shougo/denite.nvim"
-"github:Shougo/deoplete.nvim"
+"github:shougo/deoplete.nvim"
 "github:shougo/echodoc.vim"
 "github:shougo/neco-syntax"
 "github:shougo/neco-vim"
@@ -207,8 +208,10 @@
 "github:shougo/tabpagebuffer.vim"
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
+"github:shumphrey/fugitive-gitlab.vim"
 "github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
+"github:sjl/splice.vim"
 "github:sk1418/last256"
 "github:slashmili/alchemist.vim"
 "github:t9md/vim-smalls"
@@ -224,17 +227,22 @@
 "github:tomasr/molokai"
 "github:tomlion/vim-solidity"
 "github:tomtom/tlib_vim"
+"github:tpope/vim-abolish"
 "github:tpope/vim-commentary"
 "github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
+"github:tpope/vim-flagship"
 "github:tpope/vim-fugitive"
 "github:tpope/vim-pathogen"
+"github:tpope/vim-projectionist"
 "github:tpope/vim-repeat"
 "github:tpope/vim-rhubarb"
+"github:tpope/vim-scriptease"
 "github:tpope/vim-sensible"
 "github:tpope/vim-sleuth"
 "github:tpope/vim-speeddating"
 "github:tpope/vim-surround"
+"github:tpope/vim-tbone"
 "github:tpope/vim-vinegar"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
new file mode 100644
index 00000000000..febd2185bac
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
@@ -0,0 +1,4 @@
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index c33359ccbfc..f08181d9068 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2018.6.0";
-    sha256 = "a157399b45b40caa9e0b3432eaf3e7444ee4cb91497c139bcb740d42d61f9ae8";
+    version = "2018.7.0";
+    sha256 = "0ab6ce722b23274a8f70d156f55d02123dd3b686397b11d4eec0831ec69dbec5";
   };
 
   postPatch = ''
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index c51ada10d68..b3bf590bf26 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.1.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "1wh7v90ydh27gbaiwn2r6ncx6yiic4mph3w9vi1282nz2q02zxss";
+    sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8";
   };
 
   buildInputs = [ Carbon ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Simple hotkey daemon for macOS";
     homepage = https://github.com/koekeishiya/skhd;
     platforms = platforms.darwin;
-    maintainers = with maintainers; [ lnl7 ];
+    maintainers = with maintainers; [ lnl7 periklis ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index ae1c504fd19..a0c4be0ff45 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation ({
        done
     '';
 
-  crossAttrs.dontPatchShebangs = true;
+  # Not needed after https://github.com/NixOS/nixpkgs/pull/43833
+  dontPatchShebangs = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = {
     description = "The GNU Hurd, GNU project's replacement for the Unix kernel";
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 2855f5b4240..d138011d595 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -21,13 +21,11 @@ stdenv.mkDerivation {
 
   doCheck = true;
 
-  crossAttrs = {
-    postInstall =
-      # Fix the shebang to point to the cross-built shell.
-      '' sed -i "$out/bin/mig" \
-             -e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g'
-      '';
-  };
+  # Fix the shebang to point to the cross-built shell. Won't be needed
+  # after #43833.
+  postInstall = ''
+    sed -i "$out/bin/mig" -e 's|^#!/.*|#!${bash}/bin/sh|g'
+  '';
 
   meta = {
     description = "GNU MIG, the Mach interface generator";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 9ac69662130..c5f63d6671c 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -32,14 +32,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.29.0";
+  name = "busybox-1.29.1";
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
     url = "https://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8";
+    sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 594f966c2f4..64484113167 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -6,12 +6,12 @@ let
   };
 in {
   fuse_2 = mkFuse {
-    version = "2.9.7";
-    sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
+    version = "2.9.8";
+    sha256Hash = "0s04ln4k9zvvbjih8ybaa19fxg8xv7dcsz2yrlbk35psnf3l67af";
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.4";
-    sha256Hash = "1ybgd4s7naiyvaris7j6fzp604cgi5mgrn715x8l4kn5k9d840im";
+    version = "3.2.5";
+    sha256Hash = "0ibf2isbkm8p1gfaqpqblwsg0lm4s1rmcipv1qcg0wc4wwsbnqpx";
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 25078b7d753..4af5e80a655 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -105,7 +105,9 @@ let
       sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
     '';
 
-    inherit (kernel) src patches preUnpack;
+    preUnpack = kernel.preUnpack or "";
+
+    inherit (kernel) src patches;
 
     buildPhase = ''
       export buildRoot="''${buildRoot:-build}"
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 8d34e05b889..2bff43c93de 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.56";
+  version = "4.14.58";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0b647c9zs7srrxhk48aaln0q92kq7xhq9gvjc6g38fnlqvx6rxfl";
+    sha256 = "1zfyrcfsx9410gnjk1hrjs5d4p93qm6k2r9q24i5c1nhfhzf0rgz";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index bf9dfc7b972..2ac619232d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.17.8";
+  version = "4.17.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hkqypjgvr8lyskwk8z3dac8pyi4wappnk25508vs3fy08365h0k";
+    sha256 = "1s0vzzdcixy2m3ybd9z1h5b2wiiz2mgnwn09jxvj1v4rwjix457a";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index dc7c6357406..d4a2c56a894 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.142";
+  version = "4.4.144";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai";
+    sha256 = "11lsf62qd9qm6n6ilxwx0zag3phvfmfjpbdc24j4p2c9gfgqpyss";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 7d92d8a7852..3fe55b2a6f3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.113";
+  version = "4.9.115";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yxwsaxnz0k03b1zj1l95ls8qm2rra9hygnjzh9z60sax56myn63";
+    sha256 = "0fddhw9v5l8k2j31zlfikd2g397ngyynfbwg92z17vp510fxjf20";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 1408f0f1f44..1224ea4e952 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18-rc5";
-  modDirVersion = "4.18.0-rc5";
+  version = "4.18-rc6";
+  modDirVersion = "4.18.0-rc6";
   extraMeta.branch = "4.18";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1r7ia0dc4p8xvyrl5kx9v7ii1m25ly0hg6xyz3zwhaailg1y4jzk";
+    sha256 = "18xz3pk8z87lk85s6q69ia1n4z03hif7yscnl6j8z85fjycwvf6b";
   };
 
   # Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index b2171067307..80721c4b401 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,4 @@
-{ buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
+{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
 , libelf
 , utillinux
 , writeTextFile
@@ -90,9 +90,6 @@ let
 
       inherit src;
 
-      preUnpack = ''
-      '';
-
       patches = map (p: p.patch) kernelPatches;
 
       prePatch = ''
@@ -111,11 +108,6 @@ let
 
         echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
 
-        if [[ -z "$buildRoot" || ! -d "$buildRoot" ]]; then
-          echo "set $buildRoot to the build folder please"
-          exit 1
-        fi
-
         if [ -f "$buildRoot/.config" ]; then
           echo "Could not link $buildRoot/.config : file exists"
           exit 1
@@ -127,7 +119,7 @@ let
         make $makeFlags "''${makeFlagsArray[@]}" oldconfig
         runHook postConfigure
 
-        make $makeFlags prepare
+        make $makeFlags "''${makeFlagsArray[@]}" prepare
         actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
         if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
           echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
@@ -172,8 +164,14 @@ let
         unlink $out/lib/modules/${modDirVersion}/build
         unlink $out/lib/modules/${modDirVersion}/source
 
-        mkdir -p $dev/lib/modules/${modDirVersion}/build
-        cp -dpR .. $dev/lib/modules/${modDirVersion}/source
+        mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
+
+        # To save space, exclude a bunch of unneeded stuff when copying.
+        (cd .. && rsync --archive --prune-empty-dirs \
+            --exclude='/build/' \
+            --exclude='/Documentation/' \
+            * $dev/lib/modules/${modDirVersion}/source/)
+
         cd $dev/lib/modules/${modDirVersion}/source
 
         cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
@@ -259,7 +257,7 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config
   enableParallelBuilding = true;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
+  nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
       ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
       ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
       ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index f9be8225570..142c176a15f 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -15,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
   buildInputs = [ xz ];
-  # HACK until BUG issue #21191 is addressed
-  crossAttrs.preUnpack = ''PATH="${buildPackages.xz}/bin''${PATH:+:}$PATH"'';
 
   configureFlags = [
     "--sysconfdir=/etc"
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index f24d8d1f875..dbef7c41c06 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -13,23 +13,31 @@ in stdenv.mkDerivation rec {
     sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
   };
 
+  outputs = [ "bin" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--includedir=\${prefix}/include"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-dynlib=${skalibs}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
   ];
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-networking/
+    mv doc $doc/share/doc/s6-networking/html
+  '';
+
   meta = {
     homepage = http://www.skarnet.org/software/s6-linux-utils/;
     description = "A set of minimalistic Linux-specific system utilities";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 35f32b0afdd..d2f75f5875e 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,18 +1,18 @@
 { lib, stdenv, fetchurl, pkgconfig, zlib, shadow
-, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
+, ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }:
 
 let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
   majorVersion = "2.32";
-  patchVersion = "";
+  patchVersion = "1";
 
 in stdenv.mkDerivation rec {
   name = "util-linux-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc";
+    sha256 = "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6";
   };
 
   patches = [
@@ -28,12 +28,6 @@ in stdenv.mkDerivation rec {
       --replace "/bin/umount" "$out/bin/umount"
   '';
 
-  crossAttrs = {
-    # Work around use of `AC_RUN_IFELSE'.
-    preConfigure = "export scanf_cv_type_modifier=ms" + lib.optionalString (systemd != null)
-      "\nconfigureFlags+=\" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/\"";
-  };
-
   preConfigure = lib.optionalString (systemd != null) ''
     configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
   '';
@@ -49,8 +43,10 @@ in stdenv.mkDerivation rec {
     "--disable-use-tty-group"
     "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
     "--disable-makeinstall-setuid" "--disable-makeinstall-chown"
-  ]
-    ++ lib.optional (ncurses == null) "--without-ncurses";
+  ] ++ lib.optional (ncurses == null) "--without-ncurses"
+    ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+       "scanf_cv_type_modifier=ms"
+  ;
 
   makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
 
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index 8befa51566d..1b64ad74599 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -17,13 +17,11 @@ stdenv.mkDerivation {
 
   QTDIR = qt48;
   
-  crossAttrs = {
-    # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
-    QTDIR = qt48.crossDrv;
-    preBuild = ''
-      export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
-    '';
-  };
+  # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
+
+  preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
+  '';
 
   meta = {
     homepage = http://qt-project.org/wiki/jom;
diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 01eb808c108..2894f9cec8a 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.9.2";
+  version = "7.11.0";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "05976h6033v2w7d05qnigxmsrm33bg7gmgyzpvis8910fkxrhvhh";
+    sha256 = "0w2fgs5n2zdvxgcx2rn010nz81z4q3z6cbq9hmpyzxy9ygjby2w4";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     description = "Proprietary issue tracking product, also providing project management functions";
     homepage = https://www.atlassian.com/software/jira;
     license = licenses.unfree;
-    maintainers = with maintainers; [ fpletz globin ];
+    maintainers = with maintainers; [ fpletz globin ciil ];
   };
 }
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 6a2efdcc360..53c8411a22c 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,14 +8,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.1-P2"; in
+let version = "9.12.2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
+    sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 461b90bc978..7c7da361246 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -85,6 +85,7 @@ let
             --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
         '';
 
+        separateDebugInfo = true;
         enableParallelBuilding = true;
 
         makeFlags = [ "all" "fdb_java" ]
@@ -92,7 +93,9 @@ let
           # it gets statically linked in
           ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ]
           # Needed environment overrides
-          ++ [ "KVRELEASE=1" ];
+          ++ [ "KVRELEASE=1"
+               "NOSTRIP=1"
+             ];
 
         # on 6.0 and later, we can specify all this information manually
         configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
@@ -152,9 +155,9 @@ in with builtins; {
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.2pre2430_${substring 0 8 rev}";
+    version = "6.0.3pre2446_${substring 0 8 rev}";
     branch  = "release-6.0";
-    rev     = "7938d247a5eaf886a176575de6592b76374df58c";
-    sha256  = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h";
+    rev     = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5";
+    sha256  = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm";
   };
 }
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 8c86cc6577a..62fd3397cb6 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.31.2";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q";
+    sha256 = "1immk6k0wgiks1s39dhyjg79n6rgans9zy85r5wmkp4dlc3r5rx6";
   };
 
   patches = [
@@ -45,7 +45,7 @@ in pythonPackages.buildPythonApplication rec {
     signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack-python lxml matrix-synapse-ldap3
-    phonenumbers jsonschema affinity bcrypt
+    phonenumbers jsonschema affinity bcrypt sortedcontainers
   ];
 
   # Checks fail because of Tox.
@@ -59,6 +59,6 @@ in pythonPackages.buildPythonApplication rec {
     homepage = https://matrix.org;
     description = "Matrix reference homeserver";
     license = licenses.asl20;
-    maintainers = [ maintainers.ralith maintainers.roblabla ];
+    maintainers = with maintainers; [ ralith roblabla ekleog ];
   };
 }
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 217ac3f6d91..4385a4e020c 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.2.1";
+  version = "5.2.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0gv7g6ddcmdkjd1xp9dg2kq7askzaw1vkmcii21glqb74k2jfg74";
+    sha256 = "17w8ljq4p1sxcdpsiz4221gwhi3ykggpisnx1wdw22g2160q9sdj";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0j69a9cjvkknq19aa2l634b48zy1lwmv2p676hzc856zgq3h6m9m";
+    sha256 = "1frbk13sww3sw09mpkijii1kf7m19hqg58ps8gvs4dvxg12bbv3l";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index b7fddeb854d..afa6321fb5d 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
 
 let
-  pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
+  pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
   version = "2.3.3";
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 06caf191587..84872649c49 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -1,14 +1,26 @@
-{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }:
+{ elk6Version
+, enableUnfree ? true
+, stdenv
+, fetchurl
+, makeWrapper
+, jre_headless
+, utillinux
+, autoPatchelfHook
+, zlib
+}:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   version = elk6Version;
-  name = "elasticsearch-${version}";
+  name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}";
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "13hf00khq33yw6zv022vcrsf6vm43isx40x7ww8r1lqx3vmg3rli";
+    sha256 =
+      if enableUnfree
+      then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh"
+      else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4";
   };
 
   patches = [ ./es-home-6.x.patch ];
@@ -32,10 +44,22 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
   '';
 
+  passthru = { inherit enableUnfree; };
+
   meta = {
     description = "Open Source, Distributed, RESTful Search Engine";
-    license = licenses.asl20;
+    license = if enableUnfree then licenses.elastic else licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ apeschar basvandijk ];
   };
-}
+} // optionalAttrs enableUnfree {
+  dontPatchELF = true;
+  nativeBuildInputs = [ autoPatchelfHook ];
+  runtimeDependencies = [ zlib ];
+  postFixup = ''
+    for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do
+      echo "patching $exe..."
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe"
+    done
+  '';
+})
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 1ed50a65e91..58054c34225 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.6.2";
+  version = "1.6.5";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "1gklji9zwdprvv7fvy7rhgazfslwsyjq97w193v9dpsriz1rk5qa";
+    sha256 = "0swiyyw7j7264avfk0a5jqs7h1hv4bq1k1kr92v4830azc9fxrvn";
   };
 
   buildInputs = [ go-bindata bash ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a1b458986e5..cc28dc73ca8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2476,6 +2476,7 @@ let
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];
+    configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 18a9c7f3809..66570cba946 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -53,44 +53,6 @@ rec {
       });
     };
 
-
-  # Return a modified stdenv that adds a cross compiler to the
-  # builds.
-  makeStdenvCross = { stdenv
-                    , cc
-                    , buildPlatform, hostPlatform, targetPlatform
-                    , # Prior overrides are surely not valid as packages built
-                      # with this run on a different platform, so disable by
-                      # default.
-                      overrides ? _: _: {}
-                    } @ overrideArgs: let
-    stdenv = overrideArgs.stdenv.override {
-      inherit
-        buildPlatform hostPlatform targetPlatform
-        cc overrides;
-
-      allowedRequisites = null;
-      extraBuildInputs = [ ]; # Old ones run on wrong platform
-    };
-  in stdenv // {
-    mkDerivation =
-      { nativeBuildInputs ? []
-      , ...
-      } @ args:
-
-        stdenv.mkDerivation (args // {
-          nativeBuildInputs = nativeBuildInputs
-              # without proper `file` command, libtool sometimes fails
-              # to recognize 64-bit DLLs
-            ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file
-            ++ stdenv.lib.optional
-                 (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
-                 pkgs.updateAutotoolsGnuConfigScriptsHook
-            ;
-        } // args.crossAttrs or {});
-  };
-
-
   /* Modify a stdenv so that the specified attributes are added to
      every derivation returned by its mkDerivation function.
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index ab42dd319a6..bc8d772530a 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -34,17 +34,32 @@ in lib.init bootStages ++ [
   (buildPackages: {
     inherit config overlays;
     selfBuild = false;
-    stdenv = buildPackages.makeStdenvCross {
-      inherit (buildPackages) stdenv;
+    stdenv = buildPackages.stdenv.override (old: rec {
       buildPlatform = localSystem;
       hostPlatform = crossSystem;
       targetPlatform = crossSystem;
+
+      # Prior overrides are surely not valid as packages built with this run on
+      # a different platform, and so are disabled.
+      overrides = _: _: {};
+      extraBuildInputs = [ ]; # Old ones run on wrong platform
+      allowedRequisites = null;
+
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
            else if crossSystem.useAndroidPrebuilt
              then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
            else buildPackages.gcc;
-    };
+
+      extraNativeBuildInputs = old.extraNativeBuildInputs
+           # without proper `file` command, libtool sometimes fails
+           # to recognize 64-bit DLLs
+        ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file
+        ++ lib.optional
+             (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
+             buildPackages.updateAutotoolsGnuConfigScriptsHook
+        ;
+    });
   })
 
 ]
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 366be391580..22dd700b2dd 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -188,7 +188,18 @@ in rec {
   };
 
   stage1 = prevStage: let
-    persistent = _: super: { python = super.python.override { configd = null; }; };
+    persistent = self: super: with prevStage; {
+      cmake = super.cmake.override {
+        majorVersion = "3.9";  # FIXME: update ApplicationServices patch
+        isBootstrap = true;
+        useSharedLibraries = false;
+      };
+
+      python = super.callPackage ../../development/interpreters/python/cpython/2.7/boot.nix {
+        CF = null;  # use CoreFoundation from bootstrap-tools
+        configd = null;
+      };
+    };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
     extraNativeBuildInputs = [];
@@ -239,6 +250,9 @@ in rec {
         openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
         findfreetype libssh curl cmake autoconf automake libtool cpio;
 
+      # Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds.
+      libxml2 = super.libxml2.override { pythonSupport = false; };
+
       llvmPackages_5 = super.llvmPackages_5 // (let
         libraries = super.llvmPackages_5.libraries.extend (_: _: {
           inherit (llvmPackages_5) libcxx libcxxabi;
@@ -281,6 +295,15 @@ in rec {
         ncurses libffi zlib gmp pcre gnugrep
         coreutils findutils diffutils patchutils;
 
+      # Hack to make sure we don't link ncurses in bootstrap tools. The proper
+      # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
+      # quite a sledgehammer just to get the C runtime.
+      gettext = super.gettext.overrideAttrs (drv: {
+        configureFlags = drv.configureFlags ++ [
+          "--disable-curses"
+        ];
+      });
+
       llvmPackages_5 = super.llvmPackages_5 // (let
         tools = super.llvmPackages_5.tools.extend (llvmSelf: _: {
           inherit (llvmPackages_5) llvm clang-unwrapped;
@@ -303,16 +326,7 @@ in rec {
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
-    overrides = lib.composeExtensions persistent (self: super: {
-      # Hack to make sure we don't link ncurses in bootstrap tools. The proper
-      # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
-      # quite a sledgehammer just to get the C runtime.
-      gettext = super.gettext.overrideAttrs (old: {
-         configureFlags = old.configureFlags ++ [
-           "--disable-curses"
-         ];
-      });
-    });
+    overrides = persistent;
   };
 
   stdenvDarwin = prevStage: let
@@ -325,15 +339,7 @@ in rec {
 
       llvmPackages_5 = super.llvmPackages_5 // (let
         tools = super.llvmPackages_5.tools.extend (_: super: {
-          # Build man pages with final stdenv not before
-          llvm = lib.extendDerivation
-            true
-            { inherit (super.llvm) man; }
-            llvmPackages_5.llvm;
-          clang-unwrapped = lib.extendDerivation
-            true
-            { inherit (super.clang-unwrapped) man; }
-            llvmPackages_5.clang-unwrapped;
+          inherit (llvmPackages_5) llvm clang-unwrapped;
         });
         libraries = super.llvmPackages_5.libraries.extend (_: _: {
           inherit (llvmPackages_5) compiler-rt libcxx libcxxabi;
@@ -370,9 +376,8 @@ in rec {
     initialPath = import ../common-path.nix { inherit pkgs; };
     shell       = "${pkgs.bash}/bin/bash";
 
-    # Hack to avoid man pages in stdenv, building bootstrap python
     cc = pkgs.llvmPackages.libcxxClang.override {
-      cc = builtins.removeAttrs pkgs.llvmPackages.clang-unwrapped [ "man" ];
+      cc = pkgs.llvmPackages.clang-unwrapped;
     };
 
     extraNativeBuildInputs = [];
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 778f107f71e..6afd4e3a05e 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -164,7 +164,7 @@ rec {
 
       derivationArg =
         (removeAttrs attrs
-          ["meta" "passthru" "crossAttrs" "pos"
+          ["meta" "passthru" "pos"
            "doCheck" "doInstallCheck"
            "checkInputs" "installCheckInputs"
            "__impureHostDeps" "__propagatedImpureHostDeps"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 26d28609d87..c5feffcea99 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -660,6 +660,10 @@ substituteStream() {
                     echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
                     return 1
                 fi
+                if [ -z ${!varName+x} ]; then
+                    echo "substituteStream(): ERROR: variable \$$varName is unset" >&2
+                    return 1
+                fi
                 pattern="@$varName@"
                 replacement="${!varName}"
                 ;;
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
new file mode 100644
index 00000000000..33b83bdb558
--- /dev/null
+++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
@@ -0,0 +1,23 @@
+{ buildGoPackage, fetchFromGitHub, lib, ... }:
+
+buildGoPackage rec {
+  name = "amazon-ecr-credential-helper-${version}";
+  version = "0.1.0";
+
+  goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = "amazon-ecr-credential-helper";
+    rev = "v${version}";
+    sha256 = "0mpwm21fphg117ryxda7696s8bnvi4bbc8rvi4zp2m1rhl04j2yy";
+  };
+
+  meta = with lib; {
+    description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry";
+    homepage = https://github.com/awslabs/amazon-ecr-credential-helper;
+    license = licenses.asl20 ;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ /dev/null
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 02281468942..907ac58d15f 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  crossAttrs = {
-    patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
-  };
-
   meta = with stdenv.lib; {
     description = "Tools for remote synchronization and `shell archives'";
     longDescription =
diff --git a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
deleted file mode 100644
index f05eab251d4..00000000000
--- a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur sharutils-4.11.1.orig/configure sharutils-4.11.1/configure
---- sharutils-4.11.1.orig/configure	2011-06-20 11:07:40.000000000 -0400
-+++ sharutils-4.11.1/configure	2011-06-20 11:09:30.000000000 -0400
-@@ -26962,33 +26962,33 @@
-   CATALOGS="$new_CATALOGS"
- fi
- 
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--int
--main ()
--{
--    FILE * fp = popen ("date", "rb");
--    exit (fp == NULL);
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
-+#if test "$cross_compiling" = yes; then :
-+#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+#as_fn_error $? "cannot run test program while cross compiling
-+#See \`config.log' for more details" "$LINENO" 5; }
-+#else
-+#  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+#/* end confdefs.h.  */
-+#
-+#int
-+#main ()
-+#{
-+#    FILE * fp = popen ("date", "rb");
-+#    exit (fp == NULL);
-+#  ;
-+#  return 0;
-+#}
-+#_ACEOF
-+#if ac_fn_c_try_run "$LINENO"; then :
-+#
- $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-+#
-+#
-+#fi
-+#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+#  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+#fi
- 
- 
- 
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 674bb5b552b..928494667f1 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -13,12 +13,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "refind-${version}";
-  version = "0.11.2";
+  version = "0.11.3";
   srcName = "refind-src-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
-    sha256 = "1k0xpm4y0gk1rxqdyprqyqpg5j16xw3l2gm3d9zpi5n9id43jkzn";
+    sha256 = "13q1yap9r4lzm5xjx1zi434gckd3gk5p8n4vh6jav0h3r3ayp633";
   };
 
   buildInputs = [ gnu-efi ];
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
new file mode 100644
index 00000000000..40725defbed
--- /dev/null
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
+
+stdenv.mkDerivation rec {
+  name = "android-file-transfer-${version}";
+  version = "3.4";
+  src = fetchFromGitHub {
+    owner = "whoozle";
+    repo = "android-file-transfer-linux";
+    rev = "v${version}";
+    sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc";
+  };
+  buildInputs = [ cmake fuse readline pkgconfig qtbase ];
+  buildPhase = ''
+    cmake .
+    make
+  '';
+  installPhase = ''
+    make install
+  '';
+  meta = with stdenv.lib; {
+    description = "Reliable MTP client with minimalistic UI";
+    homepage = http://whoozle.github.io/android-file-transfer-linux/;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.xaverdh ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
new file mode 100644
index 00000000000..94c45ec4689
--- /dev/null
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "simg2img-${version}";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "anestisb";
+    repo = "android-simg2img";
+    rev = "${version}";
+    sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si";
+  };
+
+  buildInputs = [ zlib ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Tool to convert Android sparse images to raw images";
+    homepage = "https://github.com/anestisb/android-simg2img";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 56091a89e48..0fe6dcfbfd3 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -3,7 +3,10 @@ eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
 opencolorio, xercesc, ilmbase, osl, seexpr
 }:
 
-let boost_static = boost165.override { enableStatic = true; };
+let boost_static = boost165.override {
+  enableStatic = true;
+  enablePython = true;
+};
 in stdenv.mkDerivation rec {
 
   name = "appleseed-${version}";
@@ -28,9 +31,7 @@ in stdenv.mkDerivation rec {
       "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
       "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
       "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
-      "-DWITH_PYTHON2_BINDINGS=ON"
-      # TODO: Look further into this if someone needs Python 3.x:
-      # "-DWITH_PYTHON3_BINDINGS=ON"
+      "-DWITH_PYTHON=ON"
       "-DWITH_DISNEY_MATERIAL=ON"
       "-DUSE_SSE=ON"
       "-DUSE_SSE42=ON"
@@ -44,6 +45,11 @@ in stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.linux;
   };
+
+  # Work around a bug in the CMake build:
+  postInstall = ''
+    chmod a+x $out/bin/*
+  '';
 }
 
 # TODO: Is the below problematic?
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix
new file mode 100644
index 00000000000..8fbc09a6d82
--- /dev/null
+++ b/pkgs/tools/graphics/yaxg/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, makeWrapper,
+  maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
+
+stdenv.mkDerivation rec {
+  name = "yaxg-${version}";
+  version = "unstable-2018-05-03";
+
+  src = fetchFromGitHub {
+    owner = "DanielFGray";
+    repo = "yaxg";
+    rev = "9d6af75da2ec25dba4b8d784e431064033d67ad2";
+    sha256 = "01p6ghp1vfrlnrm78bgbl9ppqwsdxh761g0qa172dpvsqg91l1p6";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ];
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    mv yaxg $out/bin/
+    chmod +x $out/bin/yaxg
+    wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]}
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Yet Another X Grabber script";
+    longDescription = ''
+      Capture and record your screen with callbacks. Wraps maim, slop, ffmpeg,
+      and byzanz to enable still image, video, or gif recording of part or all
+      of your screen. Similar command-line interface to scrot but is overall
+      more flexible and less buggy.
+    '';
+    platforms = platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ neonfuz ];
+  };
+}
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix
index b44159be8ce..b9efead2798 100644
--- a/pkgs/tools/misc/eot-utilities/default.nix
+++ b/pkgs/tools/misc/eot-utilities/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = "Create Embedded Open Type from OpenType or TrueType font";
     license = stdenv.lib.licenses.w3c;
     maintainers = with stdenv.lib.maintainers; [ leenaars ];
-    platforms = with stdenv.lib.platforms; linux; 
+    platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 6a13d289efc..0b606882a5c 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.0.3";
+  version = "2.5.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,31 +11,41 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/execline";
     rev = "refs/tags/v${version}";
-    sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x";
+    sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn";
   };
 
+  outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--libdir=\${prefix}/lib"
-    "--includedir=\${prefix}/include"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-dynlib=${skalibs}/lib"
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/execline
+    mv doc $doc/share/doc/execline/html
+    mv examples $doc/share/doc/execline/examples
+  '';
+
   meta = {
     homepage = http://skarnet.org/software/execline/;
     description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 5e6db9fdc20..59c0396eebe 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -2,24 +2,25 @@
 
 stdenv.mkDerivation {
   name = "fortune-mod-1.99.1";
-  
+
   src = fetchurl {
     url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz;
     sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw";
   };
-  
+
   buildInputs = [ recode ];
-  
+
   preConfigure = ''
-    sed -i "s|/usr/|$out/|" Makefile 
+    sed -i "s|/usr/|$out/|" Makefile
   '';
 
   preBuild = ''
     makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=")
   '';
-  
+
   postInstall = ''
-    ln -s $out/games/fortune $out/bin/fortune
+    mv $out/games/fortune $out/bin/fortune
+    rmdir $out/games
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index e8e2152f711..b85d2bffc34 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -42,8 +42,8 @@ buildGoPackage rec {
     cp $src/bin/fzf-tmux $bin/bin
     mkdir -p $man/share/man
     cp -r $src/man/man1 $man/share/man
-    mkdir -p $out/share/vim-plugins
-    ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
+    mkdir -p $out/share/vim-plugins/${name}
+    cp -r $src/plugin $out/share/vim-plugins/${name}
 
     cp -R $src/shell $bin/share/fzf
     cat <<SCRIPT > $bin/bin/fzf-share
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix
index 6aa3fd83696..4f15ba90d39 100644
--- a/pkgs/tools/misc/logstash/6.x.nix
+++ b/pkgs/tools/misc/logstash/6.x.nix
@@ -1,12 +1,23 @@
-{ stdenv, fetchurl, elk6Version, makeWrapper, jre  }:
+{ elk6Version
+, enableUnfree ? true
+, stdenv
+, fetchurl
+, makeWrapper
+, jre
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = elk6Version;
-  name = "logstash-${version}";
+  name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
-    sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20";
+    sha256 =
+      if enableUnfree
+      then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr"
+      else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w";
   };
 
   dontBuild         = true;
@@ -35,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
     homepage    = https://www.elastic.co/products/logstash;
-    license     = licenses.asl20;
+    license     = if enableUnfree then licenses.elastic else licenses.asl20;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ wjlroe offline basvandijk ];
   };
diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 5796f6335c0..326a3b053ed 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig
-, ncurses }:
+, ncurses, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "minicom-2.7.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
       download.
     '';
     maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 082eb6879c4..014e000eabd 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka";
   };
 
+  outputs = [ "bin" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-dynlib=${skalibs}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
   ]
   # On darwin, the target triplet from -dumpmachine includes version number, but
   # skarnet.org software uses the triplet to test binary compatibility.
@@ -27,12 +31,17 @@ stdenv.mkDerivation rec {
   # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-portable-utils/
+    mv doc $doc/share/doc/s6-portable-utils/html
+  '';
+
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";
     platforms = platforms.all;
     license = licenses.isc;
-    maintainers = with maintainers; [ pmahoney ];
+    maintainers = with maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix
index efd2c17a43e..6267e3a7790 100644
--- a/pkgs/tools/networking/cntlm/default.nix
+++ b/pkgs/tools/networking/cntlm/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ which ];
 
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC"
+    substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin; cp cntlm $out/bin/;
     mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/;
@@ -21,11 +26,12 @@ stdenv.mkDerivation rec {
     description = "NTLM/NTLMv2 authenticating HTTP proxy";
     homepage = http://cntlm.sourceforge.net/;
     license = licenses.gpl2;
-    maintainers = 
+    maintainers =
       [
         maintainers.qknight
         maintainers.markWot
+        maintainers.carlosdagos
       ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix
index 5980392267b..71a87a8e9d1 100644
--- a/pkgs/tools/networking/curl/7_59.nix
+++ b/pkgs/tools/networking/curl/7_59.nix
@@ -74,7 +74,10 @@ stdenv.mkDerivation rec {
       ( if brotliSupport then "--with-brotli" else "--without-brotli" )
     ]
     ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
-    ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
+    ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
+       # For the 'urandom', maybe it should be a cross-system option
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+       "--with-random=/dev/urandom";
 
   CXX = "${stdenv.cc.targetPrefix}c++";
   CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
@@ -90,16 +93,6 @@ stdenv.mkDerivation rec {
     ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
   '';
 
-  crossAttrs = {
-    # We should refer to the cross built openssl
-    # For the 'urandom', maybe it should be a cross-system option
-    configureFlags = [
-        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
-        ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
-        "--with-random /dev/urandom"
-      ];
-  };
-
   passthru = {
     inherit sslSupport openssl;
   };
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 2ebae0b0c17..d15e6084a8b 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
 assert gssSupport -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.60.0";
+  name = "curl-7.61.0";
 
   src = fetchurl {
     urls = [
-      "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
       "https://curl.haxx.se/download/${name}.tar.bz2"
+      "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
     ];
-    sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9";
+    sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -78,7 +78,10 @@ stdenv.mkDerivation rec {
       ( if brotliSupport then "--with-brotli" else "--without-brotli" )
     ]
     ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
-    ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
+    ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
+       # For the 'urandom', maybe it should be a cross-system option
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+       "--with-random=/dev/urandom";
 
   CXX = "${stdenv.cc.targetPrefix}c++";
   CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
@@ -94,16 +97,6 @@ stdenv.mkDerivation rec {
     ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
   '';
 
-  crossAttrs = {
-    # We should refer to the cross built openssl
-    # For the 'urandom', maybe it should be a cross-system option
-    configureFlags = [
-        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
-        ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
-        "--with-random=/dev/urandom"
-      ];
-  };
-
   passthru = {
     inherit sslSupport openssl;
   };
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 81d899527e7..577e04f6648 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, kmod }:
+, withGnome ? true, gnome3, procps, kmod, file }:
 let
   pname   = "NetworkManager-vpnc";
-  version = "1.2.4";
+  version = "1.2.6";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05";
+    sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy";
   };
 
   buildInputs = [ vpnc networkmanager libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
                                         gnome3.networkmanagerapplet ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig file ];
 
   configureFlags = [
     "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 7134e969fd0..db2071ab17d 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.2.0.1";
+  version = "2.3.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,31 +11,41 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-dns";
     rev = "refs/tags/v${version}";
-    sha256 = "10qvkh608nsx8gqs3pj4pb8aivwpshbmjw2766grgmrb35d31brl";
+    sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb";
   };
 
+  outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--includedir=\${prefix}/include"
-    "--libdir=\${prefix}/lib"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-dynlib=${skalibs}/lib"
+    "--libdir=\${lib}/lib"
+    "--libexecdir=\${lib}/libexec"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-dns/
+    mv doc $doc/share/doc/s6-dns/html
+  '';
+
   meta = {
     homepage = http://www.skarnet.org/software/s6-dns/;
     description = "A suite of DNS client programs and libraries for Unix systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 3239a8f49e6..1971bbffa40 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,10 +1,25 @@
-{ stdenv, execline, fetchgit, s6, s6Dns, skalibs }:
+{ stdenv, execline, fetchgit, s6, s6-dns, skalibs
+
+# Whether to build the TLS/SSL tools and what library to use
+# acceptable values: "libressl", false
+# TODO: add bearssl
+, sslSupport ? "libressl" , libressl
+}:
 
 let
+  inherit (stdenv) lib;
 
   version = "2.3.0.2";
 
-in stdenv.mkDerivation rec {
+  sslSupportEnabled = sslSupport != false;
+  sslLibs = {
+    "libressl" = libressl;
+  };
+
+in
+assert sslSupportEnabled -> sslLibs ? ${sslSupport};
+
+stdenv.mkDerivation rec {
 
   name = "s6-networking-${version}";
 
@@ -14,34 +29,51 @@ in stdenv.mkDerivation rec {
     sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42";
   };
 
+  outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-include=${execline}/include"
-    "--with-include=${s6}/include"
-    "--with-include=${s6Dns}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-lib=${execline}/lib"
-    "--with-lib=${s6}/lib/s6"
-    "--with-lib=${s6Dns}/lib"
-    "--with-dynlib=${skalibs}/lib"
-    "--with-dynlib=${execline}/lib"
-    "--with-dynlib=${s6}/lib"
-    "--with-dynlib=${s6Dns}/lib"
+    "--libdir=\${lib}/lib"
+    "--libexecdir=\${lib}/libexec"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-include=${execline.dev}/include"
+    "--with-include=${s6.dev}/include"
+    "--with-include=${s6-dns.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-lib=${execline.lib}/lib"
+    "--with-lib=${s6.out}/lib"
+    "--with-lib=${s6-dns.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+    "--with-dynlib=${execline.lib}/lib"
+    "--with-dynlib=${s6.out}/lib"
+    "--with-dynlib=${s6-dns.lib}/lib"
   ]
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+  ++ (lib.optionals sslSupportEnabled [
+       "--enable-ssl=${sslSupport}"
+       "--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
+       "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
+     ])
+  ++ (lib.optional stdenv.isDarwin "--build=${stdenv.system}");
+
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-networking/
+    mv doc $doc/share/doc/s6-networking/html
+  '';
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-networking/;
     description = "A suite of small networking utilities for Unix systems";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index b3c256ae59b..cce3370aeda 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "cfssl-${version}";
-  version = "20170527";
+  version = "1.3.2";
 
   goPackagePath = "github.com/cloudflare/cfssl";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cfssl";
-    rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904";
-    sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1";
+    rev = version;
+    sha256 = "0j2gz2vl2pf7ir7sc7jrwmjnr67hk4qhxw09cjx132jbk337jc9x";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix
new file mode 100644
index 00000000000..1bb621eab36
--- /dev/null
+++ b/pkgs/tools/security/passff-host/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, python3, pass }:
+
+stdenv.mkDerivation rec {
+  name = "passff-host-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "passff";
+    repo = "passff-host";
+    rev = version;
+    sha256 = "1zks34rg9i8vphjrj1h80y5rijadx33z911qxa7pslf7ahmjqdv3";
+  };
+
+  buildInputs = [ python3 ];
+
+  patchPhase = ''
+    sed -i 's#COMMAND      = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py
+  '';
+
+  preBuild = "cd src";
+  postBuild = "cd ..";
+
+  installPhase = ''
+    install -D bin/testing/passff.py $out/share/passff-host/passff.py
+    cp bin/testing/passff.json $out/share/passff-host/passff.json
+    substituteInPlace $out/share/passff-host/passff.json \
+      --replace PLACEHOLDER $out/share/passff-host/passff.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Host app for the WebExtension PassFF";
+    homepage = https://github.com/passff/passff-host;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ nadrieril ];
+  };
+}
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 4923a9019ed..bb49e478910 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,7 +3,6 @@
 
 # for update.nix
 , writeScript
-, runCommand
 , common-updater-scripts
 , bash
 , coreutils
@@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
     inherit (stdenv) lib;
     inherit
       writeScript
-      runCommand
       common-updater-scripts
       bash
       coreutils
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 4f2671aeacb..ed55fa26451 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.7";
+  version = "1.7.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj";
+    sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m";
   };
 
   buildInputs = [ ronn ];
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index fd7f93d1546..56b7b26c7bd 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
   };
 
-  # Disable fstype test, tries to read /etc/mtab
-  patches = [ ./tests.patch ];
   postPatch = ''
     # Patch tests (both shebangs and usage in scripts)
     for f in $(find -type f -name '*.sh'); do
diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch
deleted file mode 100644
index a30291d7095..00000000000
--- a/pkgs/tools/system/bfs/tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests.sh
-+++ b/tests.sh
-@@ -369,7 +369,6 @@
-     test_printf_nul
-     test_quit_after_print
-     test_quit_before_print
--    test_fstype
-     test_not
-     test_and
-     test_or
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 2244f5c90d3..0afdb28728c 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
     homepage = https://github.com/cjbassi/gotop;
     license = licenses.agpl3;
     maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 9acf41c62ef..1762b98984f 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.6.0"; # with database from 2018-06-29
+  name = "pciutils-3.6.1"; # with database from 2018-06-29
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j";
+    sha256 = "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -22,16 +22,6 @@ stdenv.mkDerivation rec {
 
   installTargets = "install install-lib";
 
-  # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path).
-  # This is documented to be equivalent, see `man 3 canonicalize_file_name`.
-  # Fixes w/musl.
-  # Upstream PR: https://github.com/pciutils/pciutils/pull/6
-  postPatch = ''
-    substituteInPlace lib/sysfs.c \
-      --replace "canonicalize_file_name(path)" \
-                "realpath(path, NULL)"
-  '';
-
   # Get rid of update-pciids as it won't work.
   postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
 
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index ed1da8d450d..f6eed5671ce 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.3.0.0";
+  version = "0.4.0.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,35 +11,48 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-rc";
     rev = "refs/tags/v${version}";
-    sha256 = "174a3l92nkhxrx8gq36xmb5a7krj40iz1xdiii25nxwjfiw5ynfb";
+    sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw";
   };
 
+  outputs = [ "bin" "lib" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-include=${execline}/include"
-    "--with-include=${s6}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-lib=${execline}/lib"
-    "--with-lib=${s6}/lib/s6"
-    "--with-dynlib=${skalibs}/lib"
-    "--with-dynlib=${execline}/lib"
-    "--with-dynlib=${s6}/lib"
+    "--libdir=\${lib}/lib"
+    "--libexecdir=\${lib}/libexec"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-include=${execline.dev}/include"
+    "--with-include=${s6.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-lib=${execline.lib}/lib"
+    "--with-lib=${s6.out}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+    "--with-dynlib=${execline.lib}/lib"
+    "--with-dynlib=${s6.out}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-rc/
+    mv doc $doc/share/doc/s6-rc/html
+    mv examples $doc/share/doc/s6-rc/examples
+  '';
+
   meta = {
     homepage = http://skarnet.org/software/s6-rc/;
     description = "A service manager for s6-based systems";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index b8607a98357..035d4280494 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.6.1.1";
+  version = "2.7.1.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,32 +11,49 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6";
     rev = "refs/tags/v${version}";
-    sha256 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg";
+    sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav";
   };
 
+  # NOTE lib: cannot split lib from bin at the moment,
+  # since some parts of lib depend on executables in bin.
+  # (the `*_startf` functions in `libs6`)
+
+  outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ];
+
   dontDisableStatic = true;
 
   enableParallelBuilding = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-include=${execline}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-lib=${execline}/lib"
-    "--with-dynlib=${skalibs}/lib"
-    "--with-dynlib=${execline}/lib"
+    "--libdir=\${out}/lib"
+    "--libexecdir=\${out}/libexec"
+    "--dynlibdir=\${out}/lib"
+    "--bindir=\${out}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-include=${execline.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-lib=${execline.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+    "--with-dynlib=${execline.lib}/lib"
   ]
   ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
   ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6/
+    mv doc $doc/share/doc/s6/html
+    mv examples $doc/share/doc/s6/examples
+  '';
+
   meta = {
     homepage = http://www.skarnet.org/software/s6/;
     description = "skarnet.org's small & secure supervision software suite";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
   };
 
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fe77a591876..3663f6e9798 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -229,6 +229,10 @@ mapAliases ({
   ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+  s6Dns = s6-dns; # added 2018-07-23
+  s6Networking = s6-networking; # added 2018-07-23
+  s6LinuxUtils = s6-linux-utils; # added 2018-07-23
+  s6PortableUtils = s6-portable-utils; # added 2018-07-23
   sam = deadpixi-sam; # added 2018-04-25
   samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
   saneBackends = sane-backends; # added 2016-01-02
@@ -309,6 +313,7 @@ mapAliases ({
   # added 2018-07-16
   forceSystem = system: _:
     (import self.path { localSystem = { inherit system; }; });
+  callPackage_i686 = pkgsi686Linux.callPackage;
 
   inherit (ocaml-ng) # added 2016-09-14
     ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f73feb21327..5c5a58c4f4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22,6 +22,22 @@ with pkgs;
 
   stdenvNoCC = stdenv.override { cc = null; };
 
+  stdenvNoLibs = let
+    bintools = stdenv.cc.bintools.override {
+      libc = null;
+      noLibc = true;
+    };
+  in stdenv.override {
+    cc = stdenv.cc.override {
+      libc = null;
+      noLibc = true;
+      extraPackages = [];
+      inherit bintools;
+    };
+    allowedRequisites =
+      lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
+  };
+
   # For convenience, allow callers to get the path to Nixpkgs.
   path = ../..;
 
@@ -168,6 +184,8 @@ with pkgs;
 
   packer = callPackage ../development/tools/packer { };
 
+  pet = callPackage ../development/tools/pet { };
+
   mht2htm = callPackage ../tools/misc/mht2htm { };
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
@@ -676,6 +694,8 @@ with pkgs;
 
   browserpass = callPackage ../tools/security/browserpass { };
 
+  passff-host = callPackage ../tools/security/passff-host { };
+
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
   kwakd = callPackage ../servers/kwakd { };
@@ -858,7 +878,12 @@ with pkgs;
 
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 
-  libtensorflow = callPackage ../development/libraries/libtensorflow { };
+  libtensorflow = callPackage ../development/libraries/libtensorflow {
+    cudaSupport = config.cudaSupport or false;
+    inherit (linuxPackages) nvidia_x11;
+    cudatoolkit = cudatoolkit_9_0;
+    cudnn = cudnn_cudatoolkit_9_0;
+  };
 
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
@@ -1417,6 +1442,8 @@ with pkgs;
 
   s2png = callPackage ../tools/graphics/s2png { };
 
+  simg2img = callPackage ../tools/filesystems/simg2img { };
+
   socklog = callPackage ../tools/system/socklog { };
 
   staccato = callPackage ../tools/text/staccato { };
@@ -2227,12 +2254,15 @@ with pkgs;
 
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
   elk5Version = "5.6.9";
-  elk6Version = "6.2.4";
+  elk6Version = "6.3.2";
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
   elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
   elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { };
+  elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
+    enableUnfree = false;
+  };
 
   elasticsearchPlugins = recurseIntoAttrs (
     callPackage ../servers/search/elasticsearch/plugins.nix { }
@@ -3337,6 +3367,9 @@ with pkgs;
   kibana  = callPackage ../development/tools/misc/kibana { };
   kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { };
   kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { };
+  kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix {
+    enableUnfree = false;
+  };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
@@ -3416,6 +3449,9 @@ with pkgs;
   logstash  = callPackage ../tools/misc/logstash { };
   logstash5 = callPackage ../tools/misc/logstash/5.x.nix { };
   logstash6 = callPackage ../tools/misc/logstash/6.x.nix { };
+  logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix {
+    enableUnfree = false;
+  };
 
   logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };
 
@@ -4910,6 +4946,8 @@ with pkgs;
 
   rubocop = callPackage ../development/tools/rubocop { };
 
+  runelite = callPackage ../games/runelite { };
+
   runningx = callPackage ../tools/X11/runningx { };
 
   runzip = callPackage ../tools/archivers/runzip { };
@@ -4932,13 +4970,13 @@ with pkgs;
 
   s3gof3r = callPackage ../tools/networking/s3gof3r { };
 
-  s6Dns = callPackage ../tools/networking/s6-dns { };
+  s6-dns = callPackage ../tools/networking/s6-dns { };
 
-  s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };
+  s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
 
-  s6Networking = callPackage ../tools/networking/s6-networking { };
+  s6-networking = callPackage ../tools/networking/s6-networking { };
 
-  s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { };
+  s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
 
   sablotron = callPackage ../tools/text/xml/sablotron { };
 
@@ -5036,6 +5074,8 @@ with pkgs;
 
   siege = callPackage ../tools/networking/siege {};
 
+  sieve-connect = callPackage ../applications/networking/sieve-connect {};
+
   sigal = callPackage ../applications/misc/sigal {
     inherit (pythonPackages) buildPythonApplication fetchPypi;
   };
@@ -6182,6 +6222,7 @@ with pkgs;
   };
 
   clang = llvmPackages.clang;
+  clang-manpages = llvmPackages.clang-manpages;
 
   clang-sierraHack = clang.override {
     name = "clang-wrapper-with-reexport-hack";
@@ -6327,13 +6368,7 @@ with pkgs;
     { substitutions = { gcc = gcc-unwrapped; }; }
     ../development/compilers/gcc/libstdc++-hook.sh;
 
-  # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
-  # thrown away. TODO: find a better solution for this.
-  crossLibcStdenv = buildPackages.makeStdenvCross {
-    inherit (buildPackages.buildPackages) stdenv;
-    inherit buildPlatform hostPlatform targetPlatform;
-    cc = buildPackages.gccCrossStageStatic;
-  };
+  crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic;
 
   # The GCC used to build libc for the target platform. Normal gccs will be
   # built with, and use, that cross-compiled libc.
@@ -6820,6 +6855,7 @@ with pkgs;
   lldb_6 = llvmPackages_6.lldb;
 
   llvm = llvmPackages.llvm;
+  llvm-manpages = llvmPackages.llvm-manpages;
 
   llvm_6  = llvmPackages_6.llvm;
   llvm_5  = llvmPackages_5.llvm;
@@ -6880,13 +6916,6 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
     buildLlvmTools = buildPackages.llvmPackages_5.tools;
     targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
-  } // stdenv.lib.optionalAttrs (stdenv.isDarwin && hostPlatform == buildPlatform) {
-    cmake = buildPackages.cmake.override {
-      isBootstrap = true;
-      majorVersion = "3.9"; # 3.10.2: 'ApplicationServices/ApplicationServices.h' file not found
-    };
-    libxml2 = libxml2.override { pythonSupport = false; };
-    python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
@@ -8011,7 +8040,9 @@ with pkgs;
 
   librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };
 
-  libstdcxx5 = callPackage ../development/libraries/libstdc++5 { };
+  libgcc = callPackage ../development/libraries/gcc/libgcc { };
+
+  libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
 
   libsigrok = callPackage ../development/tools/libsigrok { };
   # old version:
@@ -8270,6 +8301,8 @@ with pkgs;
 
   kube-aws = callPackage ../development/tools/kube-aws { };
 
+  kustomize = callPackage ../development/tools/kustomize { };
+
   Literate = callPackage ../development/tools/literate-programming/Literate {};
 
   lcov = callPackage ../development/tools/analysis/lcov { };
@@ -8838,7 +8871,11 @@ with pkgs;
 
   c-blosc = callPackage ../development/libraries/c-blosc { };
 
-  cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
+  cachix = (haskell.lib.justStaticExecutables haskellPackages.cachix).overrideAttrs (drv: {
+    meta = drv.meta // {
+      hydraPlatforms = stdenv.lib.platforms.unix;
+    };
+  });
 
   capnproto = callPackage ../development/libraries/capnproto { };
 
@@ -8987,6 +9024,8 @@ with pkgs;
   db60 = callPackage ../development/libraries/db/db-6.0.nix { };
   db62 = callPackage ../development/libraries/db/db-6.2.nix { };
 
+  dbxml = callPackage ../development/libraries/dbxml { };
+
   dbus = callPackage ../development/libraries/dbus { };
   dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
   dbus-glib       = callPackage ../development/libraries/dbus-glib { };
@@ -10338,6 +10377,8 @@ with pkgs;
 
   libmypaint = callPackage ../development/libraries/libmypaint { };
 
+  libmysofa = callPackage ../development/libraries/audio/libmysofa { };
+
   libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
     mysql = mysql57;
   };
@@ -11071,15 +11112,9 @@ with pkgs;
 
   neardal = callPackage ../development/libraries/neardal { };
 
-  neon = callPackage ../development/libraries/neon {
-    compressionSupport = true;
-    sslSupport = true;
-  };
+  neon = callPackage ../development/libraries/neon { };
 
-  neon_0_29 = callPackage ../development/libraries/neon/0.29.nix {
-    compressionSupport = true;
-    sslSupport = true;
-  };
+  neon_0_29 = callPackage ../development/libraries/neon/0.29.nix { };
 
   nettle = callPackage ../development/libraries/nettle { };
 
@@ -11697,6 +11732,8 @@ with pkgs;
 
   ronn = callPackage ../development/tools/ronn { };
 
+  rshell = python3.pkgs.callPackage ../development/tools/rshell { };
+
   rubberband = callPackage ../development/libraries/rubberband {
     inherit (vamp) vampSDK;
   };
@@ -11839,6 +11876,8 @@ with pkgs;
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
 
+  soil = callPackage ../development/libraries/soil { };
+
   sonic = callPackage ../development/libraries/sonic { };
 
   soprano = callPackage ../development/libraries/soprano { };
@@ -13782,11 +13821,6 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
-        # https://github.com/NixOS/nixpkgs/issues/42755
-        # Remove these xen-netfront patches once they're included in
-        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
-        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
-        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
@@ -15400,10 +15434,7 @@ with pkgs;
     openjpeg = openjpeg_1;
   };
 
-  perkeep = callPackage ../applications/misc/perkeep {
-    # Perkeep is very particular about which go version to build with.
-    go = go_1_9;
-  };
+  perkeep = callPackage ../applications/misc/perkeep { };
 
   canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
 
@@ -15653,6 +15684,8 @@ with pkgs;
 
   docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { };
 
+  amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
+
   docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { };
 
   doodle = callPackage ../applications/search/doodle { };
@@ -16956,6 +16989,8 @@ with pkgs;
 
   kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
+  kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
+
   kupfer = callPackage ../applications/misc/kupfer { };
 
   lame = callPackage ../development/libraries/lame { };
@@ -18227,7 +18262,7 @@ with pkgs;
 
   st = callPackage ../applications/misc/st {
     conf = config.st.conf or null;
-    patches = config.st.patches or null;
+    patches = config.st.patches or [];
     extraLibs = config.st.extraLibs or [];
   };
 
@@ -18696,12 +18731,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
     inherit (darwin) libobjc cf-private;
     inherit lua;
-
-    features = "huge"; # one of  tiny, small, normal, big or huge
-    gui = config.vim.gui or "auto";
-
-    # optional features by flags
-    flags = [ "python" "X11" ]; # only flag "X11" by now
   });
 
   vimNox = lowPrio (vim_configurable.override {
@@ -19361,6 +19390,8 @@ with pkgs;
 
   armagetronad = callPackage ../games/armagetronad { };
 
+  arena = callPackage ../games/arena {};
+
   arx-libertatis = callPackage ../games/arx-libertatis {
     stdenv = overrideCC stdenv gcc6;
   };
@@ -19668,9 +19699,7 @@ with pkgs;
 
   megaglest = callPackage ../games/megaglest {};
 
-  minecraft = callPackage ../games/minecraft {
-    useAlsa = config.minecraft.alsa or false;
-  };
+  minecraft = callPackage ../games/minecraft { };
 
   minecraft-server = callPackage ../games/minecraft-server { };
 
@@ -20922,6 +20951,8 @@ with pkgs;
 
   spyder = pythonPackages.spyder;
 
+  openspace = callPackage ../applications/science/astronomy/openspace { };
+
   stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { };
 
   tulip = callPackage ../applications/science/misc/tulip {
@@ -20992,6 +21023,8 @@ with pkgs;
 
   ### MISC
 
+  android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
+
   antimicro = libsForQt5.callPackage ../tools/misc/antimicro { };
 
   atari800 = callPackage ../misc/emulators/atari800 { };
@@ -21810,6 +21843,8 @@ with pkgs;
 
   yara = callPackage ../tools/security/yara { };
 
+  yaxg = callPackage ../tools/graphics/yaxg {};
+
   zap = callPackage ../tools/networking/zap { };
 
   zdfmediathk = callPackage ../applications/video/zdfmediathk { };
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 3440bfafb11..da5fed4be4b 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -61,7 +61,7 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
+    inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 5d042c3385e..ba82bd217fd 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -298,23 +298,6 @@ let
 
   helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
 
-  hindent = melpaBuild rec {
-    pname = "hindent";
-    version = external.hindent.version;
-    src = external.hindent.src;
-    packageRequires = [ haskell-mode ];
-    propagatedUserEnvPkgs = [ external.hindent ];
-    recipe = writeText "recipe" ''
-      (hindent
-       :repo "commercialhaskell/hindent" :fetcher github
-       :files ("elisp/*.el"))
-    '';
-    meta = {
-      description = "Indent haskell code using the \"hindent\" program";
-      license = bsd3;
-    };
-  };
-
   icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
   redshank = callPackage ../applications/editors/emacs-modes/redshank { };
diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index 77f620da724..f4e778aed12 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -4,7 +4,7 @@ with pkgs;
 
 runCommand "nixpkgs-metrics"
   { buildInputs = [ nix time ];
-    requiredSystemFeatures = [ "benchmark" ];
+    # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra?
   }
   ''
     export NIX_DB_DIR=$TMPDIR
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index eb76c323dde..9bfb2f97c6e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -640,6 +640,8 @@ let
 
     ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
 
+    ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
+
     ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
 
     ppx_tools =
@@ -1067,7 +1069,7 @@ in rec
 
   ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { });
 
-  ocamlPackages_latest = ocamlPackages_4_06;
+  ocamlPackages_latest = ocamlPackages_4_07;
 
   ocamlPackages =
     # OCaml 4.05 is broken on aarch64
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 789a9076772..0af6cd7f320 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -256,6 +256,8 @@ in {
 
   ewmh = callPackage ../development/python-modules/ewmh { };
 
+  exchangelib = callPackage ../development/python-modules/exchangelib { };
+
   dbus-python = callPackage ../development/python-modules/dbus {
     dbus = pkgs.dbus;
   };
@@ -411,6 +413,8 @@ in {
     inherit (pkgs.llvmPackages) openmp;
   };
 
+  pykerberos = callPackage ../development/python-modules/pykerberos { };
+
   pynisher = callPackage ../development/python-modules/pynisher { };
 
   pyparser = callPackage ../development/python-modules/pyparser { };
@@ -471,6 +475,8 @@ in {
 
   rx = callPackage ../development/python-modules/rx { };
 
+  sabyenc = callPackage ../development/python-modules/sabyenc { };
+
   salmon-mail = callPackage ../development/python-modules/salmon-mail { };
 
   seekpath = callPackage ../development/python-modules/seekpath { };
@@ -569,6 +575,11 @@ in {
 
   appdirs = callPackage ../development/python-modules/appdirs { };
 
+  appleseed = disabledIf isPy3k
+    (toPythonModule (pkgs.appleseed.override {
+      inherit (self) python;
+    }));
+
   application = callPackage ../development/python-modules/application { };
 
   appnope = buildPythonPackage rec {
@@ -1925,11 +1936,8 @@ in {
   pytest = self.pytest_36;
 
   pytest_36 = callPackage ../development/python-modules/pytest {
-    hypothesis = self.hypothesis.override {
-      # hypothesis requires pytest that causes dependency cycle
-      doCheck = false;
-      pytest = null;
-    };
+    # hypothesis tests require pytest that causes dependency cycle
+    hypothesis = self.hypothesis.override { doCheck = false; };
   };
 
   # Needed for celery
@@ -2098,6 +2106,8 @@ in {
 
   requests-cache = callPackage ../development/python-modules/requests-cache { };
 
+  requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };
+
   requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {};
 
   howdoi = callPackage ../development/python-modules/howdoi {};
@@ -17921,6 +17931,8 @@ EOF
   z3 = (toPythonModule (pkgs.z3.override {
     inherit python;
   })).python;
+
+  rfc7464 = callPackage ../development/python-modules/rfc7464 { };
 });
 
 in fix' (extends overrides packages)