diff options
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 66 |
1 files changed, 48 insertions, 18 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5c50fe383bb9b..fbad836bc1ba1 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,9 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ overrides - -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild @@ -75,26 +73,17 @@ let ## START HERE - tablist = melpaBuild rec { - pname = "tablist"; - inherit (pdf-tools) src version; - fileSpecs = [ "lisp/tablist.el" "lisp/tablist-filter.el" ]; - meta = { - description = "Extended tabulated-list-mode"; - license = gpl3; - }; - }; - pdf-tools = melpaBuild rec { pname = "pdf-tools"; - version = "0.70"; + version = "0.80"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; rev = "v${version}"; - sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl"; + sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; }; - buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ]; + nativeBuildInputs = [ external.pkgconfig ]; + buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ]; packageRequires = [ tablist let-alist ]; @@ -205,6 +194,9 @@ let }; }; + ess-R-object-popup = + callPackage ../applications/editors/emacs-modes/ess-R-object-popup { }; + find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; @@ -225,6 +217,10 @@ let }; }; + filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { }; + + font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { }; + ghc-mod = melpaBuild rec { pname = "ghc"; version = external.ghc-mod.version; @@ -254,6 +250,12 @@ let }; }; + hexrgb = callPackage ../applications/editors/emacs-modes/hexrgb { }; + + header2 = callPackage ../applications/editors/emacs-modes/header2 { }; + + helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; + hindent = melpaBuild rec { pname = "hindent"; version = external.hindent.version; @@ -267,10 +269,17 @@ let }; }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; + + redshank = callPackage ../applications/editors/emacs-modes/redshank { }; + rtags = melpaBuild rec { pname = "rtags"; - version = "2.0"; # really, it's some arbitrary git hash + version = "2.12"; src = external.rtags.src; + + configurePhase = ":"; + propagatedUserEnvPkgs = [ external.rtags ]; fileSpecs = [ "src/*.el" ]; inherit (external.rtags) meta; @@ -287,6 +296,9 @@ let }; }; + lib-requires = + callPackage ../applications/editors/emacs-modes/lib-requires { }; + lui = melpaBuild rec { pname = "lui"; version = circe.version; @@ -303,6 +315,16 @@ let inherit lib; }; + org-mac-link = + callPackage ../applications/editors/emacs-modes/org-mac-link { }; + + perl-completion = + callPackage ../applications/editors/emacs-modes/perl-completion { }; + + railgun = callPackage ../applications/editors/emacs-modes/railgun { }; + + gn = callPackage ../applications/editors/emacs-modes/gn { }; + shorten = melpaBuild rec { pname = "shorten"; version = circe.version; @@ -314,6 +336,8 @@ let }; }; + stgit = callPackage ../applications/editors/emacs-modes/stgit { }; + structured-haskell-mode = melpaBuild rec { pname = "shm"; version = external.structured-haskell-mode.version; @@ -329,6 +353,8 @@ let }; }; + thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { }; + tramp = callPackage ../applications/editors/emacs-modes/tramp { }; weechat = melpaBuild rec { @@ -350,14 +376,18 @@ let }; }; + yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { }; + + zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { }; + }; in lib.makeScope newScope (self: {} + // melpaStablePackages self // melpaPackages self // elpaPackages self - // melpaStablePackages self // orgPackages self // packagesFun self ) |