From ce79dd4f2514e55cb6dd658b25d27a3331b6922d Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 23 Nov 2015 15:54:17 +0100
Subject: [PATCH 1/2] tablist: init at 0.70

---
 pkgs/top-level/emacs-packages.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a92f0d66ad1..35e0bf5ca8c 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -83,6 +83,16 @@ let self = _self // overrides;
     };
   };
 
+  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;
+    };
+  };
+
   ag = melpaBuild rec {
     pname   = "ag";
     version = "0.44";

From 250a165b8040e4e831d7a6e972d34a8db1845c38 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 17 Nov 2015 10:36:27 -0300
Subject: [PATCH 2/2] pdf-tools: init at v0.70

---
 pkgs/top-level/all-packages.nix   |  2 +-
 pkgs/top-level/emacs-packages.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6802fa64da..75371834094 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11563,7 +11563,7 @@ let
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
       inherit (pythonPackages) elpy;
-      inherit rtags libffi;
+      inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 35e0bf5ca8c..e10262cd5e8 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -93,6 +93,24 @@ let self = _self // overrides;
     };
   };
 
+  pdf-tools = melpaBuild rec {
+    pname = "pdf-tools";
+    version = "0.70";
+    src = fetchFromGitHub {
+      owner = "politza";
+      repo = "pdf-tools";
+      rev = "v${version}";
+      sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
+    };
+    buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ] ++ [ tablist let-alist ];
+    preBuild = "make server/epdfinfo";
+    fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ];
+    meta = {
+      description = "Emacs support library for PDF files";
+      license = gpl3;
+    };
+  };
+
   ag = melpaBuild rec {
     pname   = "ag";
     version = "0.44";