From 97651c7e372cab9000bcdd36166bb34fd5712129 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 16 Nov 2017 14:09:13 +0100
Subject: emacs: Replace custom packages with in-tree derivations

---
 packages/emacs.nix | 44 ++------------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'packages')

diff --git a/packages/emacs.nix b/packages/emacs.nix
index 59c9bf3..103bb4a 100644
--- a/packages/emacs.nix
+++ b/packages/emacs.nix
@@ -7,45 +7,6 @@
 let
   myEmacs = emacs;
   emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages;
-
-  elpaBuild = import <nixpkgs/pkgs/build-support/emacs/elpa.nix> {
-    inherit (pkgs) fetchurl lib stdenv texinfo;
-    emacs = myEmacs;
-  };
-
-  hook-helpers = pkgs.callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
-    pname = "hook-helpers";
-    version = "1.1";
-    src = fetchurl {
-      url = "http://elpa.gnu.org/packages/hook-helpers-1.1.tar";
-      sha256 = "0xvabl0lfc0ijr98clsyh0bqk2fdi1ncl0knn58j2p30gn9958i5";
-    };
-    packageRequires = [];
-    meta = {
-      homepage = https://savannah.nongnu.org/projects/hook-helpers-el/;
-      license = lib.licenses.free;
-    };
-  }) {
-    inherit elpaBuild;
-    inherit (pkgs) fetchurl lib;
-  };
-
-  dired-du = pkgs.callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
-    pname = "dired-du";
-    version = "0.5";
-    src = fetchurl {
-      url = "http://elpa.gnu.org/packages/dired-du-0.5.tar";
-      sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl";
-    };
-    packageRequires = [];
-    meta = {
-      homepage = https://github.com/calancha/dired-du;
-      license = lib.licenses.free;
-    };
-  }) {
-    inherit elpaBuild;
-    inherit (pkgs) fetchurl lib;
-  };
 in
   emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
     diminish
@@ -166,8 +127,7 @@ in
     epkgs.redshank
     # I just need the one org-package
     epkgs.orgPackages.org-plus-contrib
-    # defined above
-    hook-helpers
-    dired-du
+    epkgs.hook-helpers
+    epkgs.dired-du
     # From main packages set
   ])
-- 
cgit 1.4.1