diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2016-05-07 18:50:58 -0400 |
|---|---|---|
| committer | Michael Alan Dorman <mdorman@ironicdesign.com> | 2016-05-08 18:33:27 -0400 |
| commit | a8b3cf46695537daec2f258e9e8aafaef75e7807 (patch) | |
| tree | c9e2fab8aaac3d6fbb1a1144a23666fae5504ea2 /pkgs/top-level/emacs-packages.nix | |
| parent | 525cf616f4da8dfbd305cb0c4c01cc091c230ee2 (diff) | |
| download | nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar.gz nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar.bz2 nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar.lz nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar.xz nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.tar.zst nixlib-a8b3cf46695537daec2f258e9e8aafaef75e7807.zip | |
Use generated org and org-plus-contrib packages.
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3407a92e6a02..f70f6c37b9bc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -59,6 +59,10 @@ let inherit lib; }; + orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { + inherit fetchurl lib stdenv texinfo; + }; + emacsWithPackages = import ../build-support/emacs/wrapper.nix { inherit lib lndir makeWrapper stdenv; }; @@ -1299,19 +1303,6 @@ let }; }; - org-plus-contrib = elpaBuild rec { - pname = "org-plus-contrib"; - version = "20150406"; - src = fetchurl { - url = "http://orgmode.org/elpa/${pname}-${version}.tar"; - sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i"; - }; - meta = { - description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs"; - license = gpl3Plus; - }; - }; - org-trello = melpaBuild rec { pname = "org-trello"; version = "0.7.5"; @@ -1843,5 +1834,6 @@ in // melpaPackages self // elpaPackages self // melpaStablePackages self + // orgPackages self // packagesFun self ) |