Merge branch 'emacs-packages'

Fixes #18976. Removes all the old Emacs packages that are obsolete with
the new generated packages.

1 files changed, 0 insertions, 1356 deletions

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 87023154ccb0..1e878e8b18cb 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -75,22 +75,6 @@ let
 
   ## START HERE
 
-  ac-haskell-process = melpaBuild rec {
-    pname   = "ac-haskell-process";
-    version = "0.5";
-    src = fetchFromGitHub {
-      owner  = "purcell";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm";
-    };
-    packageRequires = [ auto-complete haskell-mode ];
-    meta = {
-      description = "Haskell code completion for auto-complete Emacs framework";
-      license = gpl3Plus;
-    };
-  };
-
   tablist = melpaBuild rec {
     pname = "tablist";
     inherit (pdf-tools) src version;
@@ -120,22 +104,6 @@ let
     };
   };
 
-  ag = melpaBuild rec {
-    pname   = "ag";
-    version = "0.44";
-    src = fetchFromGitHub {
-      owner  = "Wilfred";
-      repo   = "${pname}.el";
-      rev    = version;
-      sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k";
-    };
-    packageRequires = [ dash s ];
-    meta = {
-      description = "Search using ag from inside Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   elisp-ffi = melpaBuild rec {
     pname = "elisp-ffi";
     version = "1.0.0";
@@ -183,256 +151,6 @@ let
     };
   };
 
-  alert = melpaBuild rec {
-    pname = "alert";
-    version = "1.2";
-    src = fetchFromGitHub {
-      owner = "jwiegley";
-      repo  = pname;
-      rev   = "v${version}";
-      sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
-    };
-    packageRequires = [ gntp log4e ];
-    meta = {
-      description = "A Growl-like alerts notifier for Emacs";
-      license = gpl2Plus;
-    };
-  };
-
-  anzu = melpaBuild rec {
-    pname = "anzu";
-    version = "0.52";
-    src = fetchFromGitHub {
-      owner = "syohex";
-      repo  = "emacs-anzu";
-      rev = "f41db6225d8fb983324765aa42c94d3ee379a49f";
-      sha256 = "1mn20swasrl8kr557r1850vr1q0gcnwlxxafnc6lq5g01kjfcdxd";
-    };
-    meta = {
-      description = "Show number of matches in Emacs mode-line while searching";
-      longDescription = ''
-        anzu.el is an Emacs port of anzu.vim. anzu.el provides a minor
-        mode which displays current match and total matches information
-        in the mode-line in various search mode.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
-  apel = melpaBuild rec {
-    pname = "apel";
-    version = "10.8";
-    src = fetchFromGitHub {
-      owner  = "wanderlust";
-      repo   = pname;
-      rev    = "8402e59eadb580f59969114557b331b4d9364f95";
-      sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
-    };
-    files = [
-      "alist.el" "apel-ver.el" "broken.el" "calist.el"
-      "emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el"
-      "mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el"
-      "path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el"
-      "pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el"
-      "poem.el" "product.el" "pym.el" "richtext.el" "static.el"
-    ];
-    meta = {
-      description = "A Portable Emacs Library";
-      license = gpl3Plus; # probably
-    };
-  };
-
-  autotetris = melpaBuild {
-    pname = "autotetris-mode";
-    version = "20141114.846";
-    src = fetchFromGitHub {
-      owner = "skeeto";
-      repo = "autotetris-mode";
-      rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa";
-      sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc";
-    };
-    files = [ "autotetris-mode.el" ];
-    meta = {
-      description = "For those who are too busy to play Emacs tetris";
-      license = unlicense;
-    };
-  };
-
-  avy = melpaBuild rec {
-    pname   = "avy";
-    version = "0.3.0";
-    src = fetchFromGitHub {
-      owner  = "abo-abo";
-      repo   = pname;
-      rev    = version;
-      sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k";
-    };
-    meta = {
-      description = "Advanced cursor movement for Emacs that uses decision-trees for navigation";
-      license = gpl3Plus;
-    };
-  };
-
-  bind-key = melpaBuild {
-    pname   = "bind-key";
-    version = "20150321";
-    src = fetchFromGitHub {
-      owner  = "jwiegley";
-      repo   = "use-package";
-      rev    = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01";
-      sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0";
-    };
-    files = [ "bind-key.el" ];
-    meta = {
-      description = "A simple way to manage personal keybindings";
-      license = gpl3Plus;
-    };
-  };
-
-  browse-kill-ring = melpaBuild rec {
-    pname   = "browse-kill-ring";
-    version = "20140104";
-    src = fetchFromGitHub {
-      owner  = pname;
-      repo   = pname;
-      rev    = "f81ca5f14479fa9e938f89bf8f6baa3c4bdfb755";
-      sha256 = "149g4qs5dqy6yzdj5smb39id5f72bz64qfv5bjf3ssvhwl2rfba8";
-    };
-    meta = {
-      description = "Interactively insert items from Emacs kill-ring";
-      license = gpl2Plus;
-    };
-  };
-
-  button-lock = melpaBuild rec {
-    pname   = "button-lock";
-    version = "1.0.2";
-    src = fetchFromGitHub {
-      owner  = "rolandwalker";
-      repo   = pname;
-      rev    = "v${version}";
-      sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
-    };
-    meta = {
-      description = "Mouseable text in Emacs";
-      license  = bsd2;
-    };
-  };
-
-  caml = melpaBuild rec {
-    pname   = "caml";
-    version = "4.2.1"; # TODO: emacs doesn't seem to like 02 as a version component..
-    src = fetchFromGitHub {
-      owner  = "ocaml";
-      repo   = "ocaml";
-      rev    = "4.02.1";
-      sha256 = "05lms9qhcnwgi7k034kiiic58c9da22r32mpak0ahmvp5fylvjpb";
-    };
-    fileSpecs = [ "emacs/*.el" ];
-    configurePhase = "true";
-    meta = {
-      description = "OCaml code editing commands for Emacs";
-      license = gpl2Plus;
-    };
-  };
-
-  change-inner = melpaBuild rec {
-    pname   = "change-inner";
-    version = "20130208";
-    src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "${pname}.el";
-      rev    = "6374b745ee1fd0302ad8596cdb7aca1bef33a730";
-      sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq";
-    };
-    packageRequires = [ expand-region ];
-    meta = {
-      description = "Change contents based on semantic units in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  circe = melpaBuild rec {
-    pname   = "circe";
-    version = "2.1";
-    src = fetchFromGitHub {
-      owner  = "jorgenschaefer";
-      repo   = "circe";
-      rev    = "v${version}";
-      sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
-    };
-    packageRequires = [ lcs lui ];
-    fileSpecs = [ "circe*.el" "irc.el" "make-tls-process.el" ];
-    meta = {
-      description = "IRC client for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  company = melpaBuild rec {
-    pname   = "company";
-    version = "0.8.12";
-    src = fetchFromGitHub {
-      owner  = "company-mode";
-      repo   = "company-mode";
-      rev    = version;
-      sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
-    };
-    meta = {
-      description = "Modular text completion framework for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  company-ghc = melpaBuild rec {
-    pname   = "company-ghc";
-    version = "0.1.10";
-    src = fetchFromGitHub {
-      owner  = "iquiw";
-      repo   = "company-ghc";
-      rev    = "v${version}";
-      sha256 = "0lzwmjf91fxhkknk4z9m2v6whk1fzpa7n1rspp61lwmyh5gakj3x";
-    };
-    packageRequires = [ company ghc-mod ];
-    meta = {
-      description = "Company-mode completion backend for haskell-mode via ghc-mod";
-      license = gpl3Plus;
-    };
-  };
-
-  dash-functional = melpaBuild rec {
-    pname = "dash-functional";
-      version = "2.11.0";
-      src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "dash.el";
-      rev    = version;
-      sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
-    };
-    packageRequires = [ dash ];
-    files = [ "dash-functional.el" ];
-    meta = {
-      description = "Collection of useful combinators for Emacs Lisp";
-      license = gpl3Plus;
-    };
-  };
-
-  diminish = melpaBuild rec {
-    pname   = "diminish";
-    version = "0.45";
-    src = fetchFromGitHub {
-      owner  = "myrjola";
-      repo   = "${pname}.el";
-      rev    = "v${version}";
-      sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
-    };
-    meta = {
-      description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes";
-      homepage = http://www.eskimo.com/~seldon/;
-      license = gpl3Plus;
-    };
-  };
-
   elpy = melpaBuild rec {
     pname   = "elpy";
     version = external.elpy.version;
@@ -495,72 +213,6 @@ let
     };
   };
 
-  engine-mode = melpaBuild rec {
-    pname = "engine-mode";
-    version = "1.0.0";
-    src = fetchFromGitHub {
-      owner  = "hrs";
-      repo   = "engine-mode";
-      rev    = "v${version}";
-      sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
-    };
-    meta = {
-      description = "Minor mode for defining and querying search engines through Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  epl = melpaBuild rec {
-    pname   = "epl";
-    version = "20140823";
-    src = fetchFromGitHub {
-      owner  = "cask";
-      repo   = pname;
-      rev    = "63c78c08e345455f3d4daa844fdc551a2c18024e";
-      sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li";
-    };
-    meta = {
-      description = "Emacs Package Library";
-      longDescription = ''
-        The purpose of this library is to wrap all the quirks and hassle of
-        package.el into a sane API.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
-  evil-god-state = melpaBuild rec {
-    pname   = "evil-god-state";
-    version = "20140830";
-    src = fetchFromGitHub {
-      owner  = "gridaphobe";
-      repo   = pname;
-      rev    = "234a9b6f500ece89c3dfb5c1df5baef6963e4566";
-      sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy";
-    };
-    packageRequires = [ evil god-mode ];
-    meta = {
-      description = "An evil-mode state for using Emacs god-mode";
-      license = gpl3Plus;
-    };
-  };
-
-  evil-indent-textobject = melpaBuild rec {
-    pname   = "evil-indent-textobject";
-    version = "0.2";
-    src = fetchFromGitHub {
-      owner  = "cofi";
-      repo   = pname;
-      rev    = "70a1154a531b7cfdbb9a31d6922482791e20a3a7";
-      sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
-    };
-    packageRequires = [ evil ];
-    meta = {
-      description = "Textobject for evil based on indentation";
-      license = gpl2Plus;
-    };
-  };
-
   evil-jumper = melpaBuild rec {
     pname   = "evil-jumper";
     version = "20151017";
@@ -577,115 +229,6 @@ let
     };
   };
 
-  evil-leader = melpaBuild rec {
-    pname   = "evil-leader";
-    version = "0.4.3";
-    src = fetchFromGitHub {
-      owner  = "cofi";
-      repo   = pname;
-      rev    = version;
-      sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
-    };
-    packageRequires = [ evil ];
-    meta = {
-      description = "<leader> key for evil";
-      license = gpl3Plus;
-    };
-  };
-
-  evil-mc = melpaBuild rec {
-    pname   = "evil-mc";
-    version = "20150117";
-    src = fetchFromGitHub {
-      owner  = "gabesoft";
-      repo   = "evil-mc";
-      rev    = "80471ba1173775e706c2043afd7d20ace652df7d";
-      sha256 = "1j23avcxj79plba99yfpmj9rfpdb527d7qfp4mx658y837vji1zm";
-    };
-    packageRequires = [ evil ];
-    meta = {
-      description = "Multiple cursors implementation for evil-mode";
-      license = gpl3Plus;
-    };
-  };
-
-  evil-surround = melpaBuild rec {
-    pname   = "evil-surround";
-    version = "20140616";
-    src = fetchFromGitHub {
-      owner  = "timcharper";
-      repo   = pname;
-      rev    = "71f380b6b6ed38f739c0a4740b3d6de0c52f915a";
-      sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn";
-    };
-    packageRequires = [ evil ];
-    meta = {
-      description = "surround.vim emulation for Emacs evil mode";
-      license = gpl3Plus;
-    };
-  };
-
-  evil-visualstar = melpaBuild rec {
-    pname   = "evil-visualstar";
-    version = "20151017";
-    src = fetchFromGitHub {
-      owner  = "bling";
-      repo   = pname;
-      rev    = "bd9e1b50c03b37c57355d387f291c2ec8ce51eec";
-      sha256 = "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0";
-    };
-    packageRequires = [ evil ];
-    meta = {
-      description = "Start a * or # search from the visual selection";
-      license = gpl3Plus;
-    };
-  };
-
-  evil = melpaBuild {
-    pname   = "evil";
-    version = "1.2.5";
-    src = fetchhg {
-      url = "https://bitbucket.org/lyro/evil";
-      rev = "72593d8e83a3";
-      sha256 = "1pv055qlc3vawzdik29d6zbbv8fa2ygwylm04wa46qr5sj53v0i8";
-    };
-    packageRequires = [ goto-chg undo-tree ];
-    meta = {
-      description = "Extensible vi layer for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  exec-path-from-shell = melpaBuild rec {
-    pname   = "exec-path-from-shell";
-    version = "20141022";
-    src = fetchFromGitHub {
-      owner  = "purcell";
-      repo   = pname;
-      rev    = "e4af0e9b44738e7474c89ed895200b42e6541515";
-      sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd";
-    };
-    meta = {
-      description = "Slurp environment variables from shell to Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  expand-region = melpaBuild rec {
-    pname   = "expand-region";
-    version = "20150902";
-    src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "${pname}.el";
-      rev    = "59f67115263676de5345581216640019975c4fda";
-      sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
-    };
-    meta = {
-      description = "Increases the selected region by semantic units in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   find-file-in-project = melpaBuild rec {
     pname = "find-file-in-project";
     version = "3.5";
@@ -706,22 +249,6 @@ let
     };
   };
 
-  flim = melpaBuild rec {
-    pname = "flim";
-    version = "1.14.9"; # 20141216
-    src = fetchFromGitHub {
-      owner  = "wanderlust";
-      repo   = pname;
-      rev    = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2";
-      sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs";
-    };
-    packageRequires = [ apel ];
-    meta = {
-      description = "Email message encoding library for Emacs";
-      license = gpl3Plus; # probably
-    };
-  };
-
   ghc-mod = melpaBuild rec {
     pname = "ghc";
     version = external.ghc-mod.version;
@@ -757,328 +284,6 @@ let
     inherit (external.rtags) meta;
   };
 
-  git-auto-commit-mode = melpaBuild rec {
-    pname = "git-auto-commit-mode";
-    version = "4.4.0";
-    src = fetchFromGitHub {
-      owner  = "ryuslash";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
-    };
-    meta = {
-      description = "Automatically commit to Git after each save";
-      license = gpl3Plus;
-    };
-  };
-
-  git-gutter = melpaBuild rec {
-    pname = "git-gutter";
-    version = "20150930";
-    src = fetchFromGitHub {
-      owner  = "syohex";
-      repo   = "emacs-git-gutter";
-      rev    = "df7fb13481bea2b1476ca8a20bc958b17d1e06ae";
-      sha256 = "1xwdyjh13lp06yy9477013nj6idpsjr4ifg7hmyk5ai80axkgly7";
-    };
-    files = [ "git-gutter.el" ];
-    meta = {
-      description = "Show diff status of lines in a buffer relative to Git, mercurial, svn or bazaar repo's HEAD";
-      license = gpl3Plus;
-    };
-  };
-
-  #TODO git-gutter-fringe
-
-  git-timemachine = melpaBuild rec {
-    pname = "git-timemachine";
-    version = "2.3";
-    src = fetchFromGitHub {
-      owner  = "pidu";
-      repo   = pname;
-      rev    = version;
-      sha256 = "1lm6rgbzbxnwfn48xr6bg05lb716grfr4nqm8lvjm64nabh5y9bh";
-    };
-    meta = {
-      description = "Step through historic revisions of Git controlled files";
-      license = gpl3Plus;
-    };
-  };
-
-  gitattributes-mode = melpaBuild rec {
-    pname = "gitattributes-mode";
-    version = "1.0.0";
-    src = fetchFromGitHub {
-      owner  = "magit";
-      repo   = "git-modes";
-      rev    = version;
-      sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
-    };
-    files = [ "gitattributes-mode.el" ];
-    meta = {
-      description = "Emacs major-mode for editing gitattributes files";
-      license = gpl3Plus;
-    };
-  };
-
-  gitconfig-mode = melpaBuild rec {
-    pname = "gitconfig-mode";
-    version = "1.0.0";
-    src = fetchFromGitHub {
-      owner  = "magit";
-      repo   = "git-modes";
-      rev    = version;
-      sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
-    };
-    files = [ "gitconfig-mode.el" ];
-    meta = {
-      description = "Emacs major-mode for editing gitconfig files";
-      license = gpl3Plus;
-    };
-  };
-
-  gitignore-mode = melpaBuild rec {
-    pname = "gitignore-mode";
-    version = "1.0.0";
-    src = fetchFromGitHub {
-      owner  = "magit";
-      repo   = "git-modes";
-      rev    = version;
-      sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
-    };
-    files = [ "gitignore-mode.el" ];
-    meta = {
-      description = "Emacs major-mode for editing gitignore files";
-      license = gpl3Plus;
-    };
-  };
-
-  gntp = melpaBuild rec {
-    pname = "gntp";
-    version = "0.1";
-    src = fetchFromGitHub {
-      owner = "tekai";
-      repo  = "${pname}.el";
-      rev   = "v${version}";
-      sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
-    };
-    meta = {
-      description = "GNTP protocol implementation for Emacs";
-      license = gpl2Plus;
-    };
-  };
-
-  gnus = melpaBuild rec {
-    pname   = "gnus";
-    version = "20140501";
-    src = fetchgit {
-      url = "http://git.gnus.org/gnus.git";
-      rev = "4228cffcb7afb77cf39678e4a8988a57753502a5";
-      sha256 = "0qd0wpxkz47irxghmdpa524c9626164p8vgqs26wlpbdwyvm64a0";
-    };
-    fileSpecs = [ "lisp/*.el" "texi/*.texi" ];
-    preBuild = ''
-      (cd lisp && make gnus-load.el)
-    '';
-    meta = {
-      description = "News and mail reader for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  go-mode = melpaBuild rec {
-    pname = "go-mode";
-    version = "20150817";
-    src = fetchFromGitHub {
-      owner  = "dominikh";
-      repo   = "go-mode.el";
-      rev    = "5d53a13bd193653728e74102c81aa931b780c9a9";
-      sha256 = "0hvssmvzvn13j18282nsq8fclyjs0x103gj9bp6fhmzxmzl56l7g";
-    };
-    meta = {
-      description = "Go language support for Emacs";
-      license = bsd3;
-    };
-  };
-
-  god-mode = melpaBuild rec {
-    pname   = "god-mode";
-    version = "20140811";
-    src = fetchFromGitHub {
-      owner  = "chrisdone";
-      repo   = pname;
-      rev    = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6";
-      sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x";
-    };
-    meta = {
-      description = "A global minor mode for entering Emacs commands without modifier keys";
-      license = gpl3Plus;
-    };
-  };
-
-  goto-chg = melpaBuild rec {
-    pname   = "goto-chg";
-    version = "1.6";
-    src = fetchhg {
-      url = "https://bitbucket.org/lyro/evil";
-      rev = "e5588e50c0e40a66c099868ea825755e348311fb";
-      sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8";
-    };
-    files = [ "lib/goto-chg.el" ];
-    meta = {
-      description = "Goto last change in current buffer using Emacs undo information";
-      license = gpl3Plus;
-    };
-  };
-
-  haskell-mode = melpaBuild rec {
-    pname   = "haskell-mode";
-    version = "13.16";
-    src = fetchFromGitHub {
-      owner  = "haskell";
-      repo   = pname;
-      rev    = "v${version}";
-      sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv";
-    };
-    meta = {
-      description = "Haskell language support for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  helm-bibtex = melpaBuild rec {
-    pname = "helm-bibtex";
-    version = "20151125";
-    src = fetchFromGitHub {
-      owner = "tmalsburg";
-      repo = pname;
-      rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0";
-      sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi";
-    };
-    packageRequires = [ dash f helm parsebib s ];
-    meta = {
-      description = "Bibliography Manager for Emacs";
-      license = gpl2;
-    };
-  };
-
-  helm-swoop = melpaBuild rec {
-    pname   = "helm-swoop";
-    version = "20141224";
-    src = fetchFromGitHub {
-      owner  = "ShingoFukuyama";
-      repo   = pname;
-      rev    = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae";
-      sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m";
-    };
-    packageRequires = [ helm ];
-    meta = {
-      description = "An Emacs mode which constructs an editable grep for a buffer";
-      license = gpl3Plus;
-    };
-  };
-
-  # deprecated, part of haskell-mode now
-  hi2 = melpaBuild rec {
-    pname   = "hi2";
-    version = "1.0";
-    src = fetchFromGitHub {
-      owner  = "nilcons";
-      repo   = pname;
-      rev    = version;
-      sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
-    };
-    meta = {
-      description = "Minor haskell-indentation mode for haskell-mode, 2nd try";
-      license = gpl3Plus;
-    };
-  };
-
-  highlight-indentation = melpaBuild rec {
-    pname = "highlight-indentation";
-    version = "0.7.0";
-    src = fetchFromGitHub {
-      owner = "antonj";
-      repo = "Highlight-Indentation-for-Emacs";
-      rev = "v${version}";
-      sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
-    };
-    meta = {
-      description = "Minor modes to highlight indentation guides in emacs";
-      longDescription = ''
-        Provides two minor modes highlight-indentation-mode and
-        highlight-indentation-current-column-mode
-
-        - highlight-indentation-mode displays guidelines indentation
-        (space indentation only).
-        - highlight-indentation-current-column-mode displays guidelines for the
-        current-point indentation (space indentation only).
-      '';
-      license = gpl2Plus;
-    };
-  };
-
-  hydra = melpaBuild rec {
-    pname   = "hydra";
-    version = "0.13.3";
-    src = fetchFromGitHub {
-      owner  = "abo-abo";
-      repo   = pname;
-      rev    = version;
-      sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
-    };
-    meta = {
-      description = "Tie related Emacs commands into a family of short bindings with a common prefix";
-      license = gpl3Plus;
-    };
-  };
-
-  ibuffer-vc = melpaBuild rec {
-    pname   = "ibuffer-vc";
-    version = "0.10";
-    src = fetchFromGitHub {
-      owner  = "purcell";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
-    };
-    meta = {
-      description = "Version control aware Emacs ibuffer mode";
-      license = gpl3Plus;
-    };
-  };
-
-  ido-ubiquitous = melpaBuild rec {
-    pname   = "ido-ubiquitous";
-    version = "2.17";
-    src = fetchFromGitHub {
-      owner  = "DarwinAwardWinner";
-      repo   = pname;
-      rev    = "323e4cddc05d5a4546c1b64132b2b1e9f8896452";
-      sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja";
-    };
-    meta = {
-      description = "Does what you expected ido-everywhere should do in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  idris-mode = melpaBuild rec {
-    pname   = "idris-mode";
-    version = "0.9.19";
-    src = fetchFromGitHub {
-      owner  = "idris-hackers";
-      repo   = "idris-mode";
-      rev    = version;
-      sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
-    };
-    packageRequires = [ prop-menu ];
-    meta = {
-      description = "Idris language support for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   lcs = melpaBuild rec {
     pname   = "lcs";
     version = circe.version;
@@ -1090,21 +295,6 @@ let
     };
   };
 
-  log4e = melpaBuild rec {
-    pname = "log4e";
-    version = "0.3.0";
-    src = fetchFromGitHub {
-      owner = "aki2o";
-      repo  = pname;
-      rev   = "v${version}";
-      sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
-    };
-    meta = {
-      description = "Logging for elisp";
-      license = gpl2Plus;
-    };
-  };
-
   lui = melpaBuild rec {
     pname   = "lui";
     version = circe.version;
@@ -1117,341 +307,10 @@ let
     };
   };
 
-  markdown-toc = melpaBuild rec {
-    pname = "markdown-toc";
-    version = "0.0.8";
-    src = fetchFromGitHub {
-      owner = "ardumont";
-      repo = pname;
-      rev = "06903e24457460a8964a978ace709c69afc36692";
-      sha256 = "07w0w9g81c6c404l3j7gb420wc2kjmah728w84mdymscdl5w3qyl";
-    };
-    packageRequires = [ markdown-mode dash s ];
-    files = [ "${pname}.el" ];
-    meta = {
-      description = "Generate a TOC in markdown file";
-      longDescription = ''
-        A simple mode to create TOC in a markdown file.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
-  moe-theme = melpaBuild rec {
-    pname   = "moe-theme";
-    version = "1.0";
-    src = fetchFromGitHub {
-      owner  = "kuanyui";
-      repo   = "${pname}.el";
-      rev    = "39384a7a9e6886f3a3d79efac4009fcd800a4a14";
-      sha256 = "0i7m15x9sij5wh0gwbijsis8a4jm8izywj7xprk21644ndskvfiz";
-    };
-    meta = {
-      description = "A set of Emacs themes optimized for terminals with 256 colors";
-      license = gpl3Plus;
-    };
-  };
-
-  monokai-theme = melpaBuild rec {
-    pname   = "monokai-theme";
-    version = "1.0.0";
-    src = fetchFromGitHub {
-      owner  = "oneKelvinSmith";
-      repo   = "monokai-emacs";
-      rev    = "v${version}";
-      sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
-    };
-    meta = {
-      description = "An Emacs port of TextMate' Monokai theme inspired by Zenburn theme";
-      license = gpl3Plus;
-    };
-  };
-
-  multiple-cursors = melpaBuild rec {
-    pname = "multiple-cursors";
-    version = "20150627";
-    src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "multiple-cursors.el";
-      rev    = "9b53e892e6167f930763a3c5aedf8773110a8ae9";
-      sha256 = "0wcrdb137a9aq6dynlqbvypb6m2dj48m899xwy7ilnf2arrmipid";
-    };
-    meta = {
-      description = "Edit text in many places simultaneously in Emacs";
-      license = gpl3Plus; # TODO
-    };
-  };
-
   nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
     inherit lib;
   };
 
-  org2jekyll = melpaBuild rec {
-    pname   = "org2jekyll";
-    version = "0.1.8";
-    src = fetchFromGitHub {
-      owner = "ardumont";
-      repo = pname;
-      rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
-      sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
-    };
-    packageRequires = [ dash-functional s deferred ];
-    files = [ "${pname}.el" ];
-    meta = {
-      description = "Blogging with org-mode and jekyll without alien yaml headers";
-      license = gpl3Plus;
-    };
-  };
-
-  org-trello = melpaBuild rec {
-    pname = "org-trello";
-    version = "0.7.5";
-    src = fetchFromGitHub {
-      owner = "org-trello";
-      repo = pname;
-      rev = "3718ed704094e5e5a491749f1f722d76ba4b7d73";
-      sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
-    };
-    packageRequires = [ request-deferred deferred dash-functional s ];
-    files = [ "org-trello*.el" ];
-    meta = {
-      description = "Org minor mode - 2-way sync org & trello";
-      longDescription = ''
-        Org-trello is an emacs minor mode that extends org-mode with
-        Trello abilities.
-      '';
-      homepage = https://org-trello.github.io/;
-      license = gpl3Plus;
-    };
-  };
-
-  parsebib = melpaBuild rec {
-    pname = "parsebib";
-    version = "20151006";
-    src = fetchFromGitHub {
-      owner = "joostkremers";
-      repo = pname;
-      rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
-      sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
-    };
-    meta = {
-      description = "Emacs library for reading .bib files";
-      license = bsd3;
-    };
-  };
-
-  perspective = melpaBuild rec {
-    pname   = "perspective";
-    version = "1.12";
-    src = fetchFromGitHub {
-      owner  = "nex3";
-      repo   = "${pname}-el";
-      rev    = version;
-      sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
-    };
-    meta = {
-      description = "Tagged workspaces like in most tiling window managers, but in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  pkg-info = melpaBuild rec {
-    pname   = "pkg-info";
-    version = "20140610";
-    src = fetchFromGitHub {
-      owner  = "lunaryorn";
-      repo   = "${pname}.el";
-      rev    = "475cdeb0b8d44f9854e506c429eeb445787014ec";
-      sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p";
-    };
-    packageRequires = [ epl ];
-    meta = {
-      description = "Provide information about Emacs packages";
-      license = gpl3Plus;
-    };
-  };
-
-  projectile = melpaBuild rec {
-    pname   = "projectile";
-    version = "0.13.0";
-    src = fetchFromGitHub {
-      owner  = "bbatsov";
-      repo   = pname;
-      rev    = "v${version}";
-      sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
-    };
-    fileSpecs = [ "projectile.el" ];
-    packageRequires = [ dash helm pkg-info ];
-    meta = {
-      description = "A project interaction library for Emacs";
-      license = gpl3Plus;
-    };
-  };
-  helm-projectile = melpaBuild rec {
-    pname   = "helm-projectile";
-    version = projectile.version;
-    src     = projectile.src;
-    fileSpecs = [ "helm-projectile.el" ];
-    packageRequires = [ helm projectile ];
-    meta = projectile.meta;
-  };
-  persp-projectile = melpaBuild rec {
-    pname   = "persp-projectile";
-    version = projectile.version;
-    src     = projectile.src;
-    fileSpecs = [ "persp-projectile.el" ];
-    packageRequires = [ perspective projectile ];
-    meta = projectile.meta;
-  };
-
-  prop-menu = melpaBuild rec {
-    pname   = "prop-menu";
-    version = "0.1.2";
-    src = fetchFromGitHub {
-      owner  = "david-christiansen";
-      repo   = "${pname}-el";
-      rev    = version;
-      sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
-    };
-    meta = {
-      description = "Library for computing context menus based on text properties and overlays in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  pyvenv = melpaBuild rec {
-    pname = "pyvenv";
-    version = "1.7";
-    src = fetchFromGitHub {
-      owner  = "jorgenschaefer";
-      repo   = pname;
-      rev    = "e4f2fa7a32cf480f34d628d8eb5b9b60374d0e8e";
-      sha256 = "1669id1p69kpq8zzldxj1p6iyz68701snn462g22k2acfzc2bfha";
-    };
-    meta = {
-      description = "Python virtual environment interface for Emacs";
-      longDescription = ''
-        This is a simple global minor mode which will replicate the changes done
-        by virtualenv activation inside Emacs.
-      '';
-      license = gpl2Plus;
-    };
-  };
-
-  rainbow-delimiters = melpaBuild rec {
-    pname = "rainbow-delimiters";
-    version = "2.1.1";
-    src = fetchFromGitHub {
-      owner = "Fanael";
-      repo = pname;
-      rev = version;
-      sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
-    };
-    meta = {
-      description = "Highlight delimiters with colors according to their depth";
-      license = gpl3Plus;
-    };
-  };
-
-  request = melpaBuild rec {
-    pname = "request";
-    version = "0.2.0";
-
-    src = fetchFromGitHub {
-      owner = "tkf";
-      repo = "emacs-${pname}";
-      rev = "adf7de452f9914406bfb693541f1d280093c4efd";
-      sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92";
-    };
-
-    files = [ "request.el" ];
-
-    meta = {
-      description = "Easy HTTP request for Emacs Lisp";
-      longDescription = ''
-        Request.el is a HTTP request library with multiple backends. It supports
-        url.el which is shipped with Emacs and curl command line program. User
-        can use curl when s/he has it, as curl is more reliable than url.el.
-        Library author can use request.el to avoid imposing external dependencies
-        such as curl to users while giving richer experience for users who have curl.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
-  request-deferred = melpaBuild rec {
-    pname = "request-deferred";
-    version = request.version;
-    src = request.src;
-    packageRequires = [ request deferred ];
-    files = [ "request-deferred.el" ];
-    meta = request.meta
-        // { description = "${request.meta.description} (deferred)"; };
-  };
-
-  rich-minority = melpaBuild rec {
-    pname   = "rich-minority";
-    version = "0.1.1";
-    src = fetchFromGitHub {
-      owner  = "Bruce-Connor";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k";
-    };
-    packageRequires = [ dash ];
-    meta = {
-      description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line";
-      license = gpl3Plus;
-    };
-  };
-
-  rust-mode = melpaBuild rec {
-    pname = "rust-mode";
-    version = "20151026";
-
-    src = fetchFromGitHub {
-      owner = "rust-lang";
-      repo = pname;
-      rev = "1761a9c212cdbc46cab5377c0ce90f96e33b2fbb";
-      sha256 = "1wvjisi26lb4g5rjq80kq9jmf1r2m3isy47nwrnahfzxk886qfbq";
-      };
-    meta = {
-      description = "A major mode for editing rust code";
-      license = asl20;
-    };
-  };
-
-  s = melpaBuild rec {
-    pname   = "s";
-    version = "20151023";
-    src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "${pname}.el";
-      rev    = "372e94c1a28031686d75d6c52bfbe833a118a72a";
-      sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h";
-    };
-    meta = {
-      description = "String manipulation library for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  semi = melpaBuild rec {
-    pname = "semi";
-    version = "1.14.7"; # 20150203
-    src = fetchFromGitHub {
-      owner  = "wanderlust";
-      repo   = pname;
-      rev    = "9976269556c5bcc021e4edf1b0e1accd39929528";
-      sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68";
-    };
-    packageRequires = [ apel flim ];
-    meta = {
-      description = "MIME library for Emacs";
-      license = gpl3Plus; # probably
-    };
-  };
-
   shorten = melpaBuild rec {
     pname   = "shorten";
     version = circe.version;
@@ -1463,60 +322,6 @@ let
     };
   };
 
-  smart-mode-line = melpaBuild rec {
-    pname   = "smart-mode-line";
-    version = "2.6";
-    src = fetchFromGitHub {
-      owner  = "Bruce-Connor";
-      repo   = pname;
-      rev    = version;
-      sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6";
-    };
-    packageRequires = [ dash rich-minority ];
-    meta = {
-      description = "Sexy mode-line for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  smartparens = melpaBuild rec {
-    pname   = "smartparens";
-    version = "20151025";
-    src = fetchFromGitHub {
-      owner  = "Fuco1";
-      repo   = pname;
-      rev    = "85583f9570be58f17ccd68388d9d4e58234d8ae9";
-      sha256 = "1pvzcrnzvksx1rzrr19256x1qhidr2acz6yipijlfx2zfjx2gxa7";
-    };
-    packageRequires = [ dash ];
-    meta = {
-      description = "Minor mode for Emacs that deals with parens pairs";
-      longDescription = ''
-        It started as a unification effort to combine functionality of
-        several existing packages in a single, compatible and
-        extensible way to deal with parentheses, delimiters, tags and
-        the like. Some of these packages include autopair, textmate,
-        wrap-region, electric-pair-mode, paredit and others.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
-  smex = melpaBuild rec {
-    pname = "smex";
-    version = "20141210";
-    src = fetchFromGitHub {
-      owner  = "nonsequitur";
-      repo   = pname;
-      rev    = "aff8d4485139ac28f1c7e62912c0d0d480995831";
-      sha256 = "0017f1ji7rxad2n49dhn5g0pmw6lmw80cqk6dynszizj46xpbqfp";
-    };
-    meta = {
-      description = "M-x enhancement for Emacs build on top of Ido";
-      license = emacs.meta.license; # should be "same as Emacs"
-    };
-  };
-
   structured-haskell-mode = melpaBuild rec {
     pname = "shm";
     version = external.structured-haskell-mode.version;
@@ -1532,139 +337,8 @@ let
     };
   };
 
-  swiper = melpaBuild rec {
-    pname   = "swiper";
-    version = "0.7.0";
-    src = fetchFromGitHub {
-      owner  = "abo-abo";
-      repo   = pname;
-      rev    = version;
-      sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
-    };
-    fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ];
-    meta = {
-      description = "Overview as you search for a regex in Emacs";
-      license = gpl3Plus;
-    };
-  };
-  ivy = swiper;
-
-  #TODO: swiper-helm
-
-  switch-window = melpaBuild rec {
-    pname   = "switch-window";
-    version = "20140919";
-    src = fetchFromGitHub {
-      owner  = "dimitri";
-      repo   = pname;
-      rev    = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5";
-      sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd";
-    };
-    meta = {
-      description = "Visual replacement for C-x o in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   tramp = callPackage ../applications/editors/emacs-modes/tramp { };
 
-  tracking = melpaBuild rec {
-    pname   = "tracking";
-    version = circe.version;
-    src     = circe.src;
-    packageRequires = [ shorten ];
-    fileSpecs = [ "tracking.el" ];
-    meta = {
-      description = "Register buffers for user review library for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  tuareg = melpaBuild rec {
-    pname = "tuareg";
-    version = "2.0.9";
-    src = fetchFromGitHub {
-      owner  = "ocaml";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
-    };
-    packageRequires = [ caml ];
-    meta = {
-      description = "Extension of OCaml mode for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  use-package = melpaBuild rec {
-    pname   = "use-package";
-    version = "20151112";
-    src = fetchFromGitHub {
-      owner  = "jwiegley";
-      repo   = pname;
-      rev    = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01";
-      sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0";
-    };
-    packageRequires = [ bind-key diminish ];
-    files = [ "use-package.el" ];
-    meta = {
-      description = "Isolate package configuration in your .emacs file";
-      license = gpl3Plus;
-    };
-  };
-
-  volatile-highlights = melpaBuild rec {
-    pname   = "volatile-highlights";
-    version = "1.11";
-    src = fetchFromGitHub {
-      owner  = "k-talo";
-      repo   = "${pname}.el";
-      rev    = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
-      sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
-    };
-    meta = {
-      description = "Brings visual feedback to some operations in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  wanderlust = melpaBuild rec {
-    pname = "wanderlust";
-    version = "2.15.9"; # 20150301
-    src = fetchFromGitHub {
-      owner  = pname;
-      repo   = pname;
-      rev    = "13fb4f6519490d4ac7138f3bcf76707654348071";
-      sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn";
-    };
-    packageRequires = [ apel flim semi ];
-    fileSpecs = [
-      "doc/wl.texi" "doc/wl-ja.texi"
-      "elmo/*.el" "wl/*.el"
-      "etc/icons"
-    ];
-    meta = {
-      description = "E-Mail client for Emacs";
-      license = gpl3Plus; # probably
-    };
-  };
-
-  web-mode = melpaBuild rec {
-    pname   = "web-mode";
-    version = "11.1.12";
-    src = fetchFromGitHub {
-      owner  = "fxbois";
-      repo   = pname;
-      rev    = "67259f16bfaec5c006a53533b8feeba7771e1365";
-      sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj";
-    };
-
-    meta = {
-      description = "Web template editing mode for Emacs";
-      license = gpl2;
-    };
-  };
-
   weechat = melpaBuild rec {
     pname   = "weechat.el";
     version = "0.2.2";
@@ -1684,36 +358,6 @@ let
     };
   };
 
-  wgrep = melpaBuild rec {
-    pname   = "wgrep";
-    version = "20141017";
-    src = fetchFromGitHub {
-      owner  = "mhayashi1120";
-      repo   = "Emacs-wgrep";
-      rev    = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
-      sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
-    };
-    meta = {
-      description = "Writable grep buffer mode for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  zenburn-theme = melpaBuild rec {
-    pname   = "zenburn-theme";
-    version = "2.2";
-    src = fetchFromGitHub {
-      owner  = "bbatsov";
-      repo   = "zenburn-emacs";
-      rev    = "v${version}";
-      sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv";
-    };
-    meta = {
-      description = "An Emacs port of Vim's low contrast Zerburn theme";
-      license = gpl3Plus;
-    };
-  };
-
   };
 
 in