From 860336e7860d1c196427853ccd0d67a6fe021286 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 11 Jan 2015 18:34:58 +0100
Subject: [PATCH 1/2] Add d-mode to emacs modes

---
 .../editors/emacs-modes/d/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/d/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix
new file mode 100644
index 00000000000..dd3a2305efd
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/d/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "20150111";
+
+in stdenv.mkDerivation {
+  name = "emacs-d-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";
+    sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4568f4a70..24904fa59a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9592,6 +9592,8 @@ let
 
     cua = callPackage ../applications/editors/emacs-modes/cua { };
 
+    d = callPackage ../applications/editors/emacs-modes/d { };
+
     darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
 
     dash = callPackage ../applications/editors/emacs-modes/dash { };

From f8247edd1c27fe8b9f3926b92a81e977db78a04e Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 11 Jan 2015 18:40:53 +0100
Subject: [PATCH 2/2] Add meta attributes to emacsPackages.d

---
 pkgs/applications/editors/emacs-modes/d/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix
index dd3a2305efd..28736acded2 100644
--- a/pkgs/applications/editors/emacs-modes/d/default.nix
+++ b/pkgs/applications/editors/emacs-modes/d/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl, emacs}:
 
+# Note: Don't have a version, using date as fallback.
 let version = "20150111";
 
 in stdenv.mkDerivation {
@@ -20,4 +21,12 @@ in stdenv.mkDerivation {
     install -d $out/share/emacs/site-lisp
     install *.el *.elc $out/share/emacs/site-lisp
   '';
+
+  meta = {
+    description = "Major mode for editing D code";
+    homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+  };
+
 }