From a4cbd69ef05d7722118329c92fa162bd24974fc9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 14 Sep 2016 21:32:29 +0200
Subject: [PATCH] emacs-modes: add upstream tramp

this fixes http://emacs.stackexchange.com/questions/21026/tramp-recreates-dev-null-as-a-regular-file
---
 .../editors/emacs-modes/tramp/default.nix        | 16 ++++++++++++++++
 pkgs/top-level/emacs-packages.nix                |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/tramp/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix
new file mode 100644
index 000000000000..b0cfe9979081
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, emacs, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "tramp-2.3.0";
+  src = fetchurl {
+    url = "mirror://gnu/tramp/${name}.tar.gz";
+    sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi";
+  };
+  buildInputs = [ emacs texinfo ];
+  meta = {
+    description = "Transparently access remote files from Emacs. Newer versions than built-in.";
+    homepage = https://www.gnu.org/software/tramp;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 62fb9407ee53..87023154ccb0 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1566,6 +1566,8 @@ let
     };
   };
 
+  tramp = callPackage ../applications/editors/emacs-modes/tramp { };
+
   tracking = melpaBuild rec {
     pname   = "tracking";
     version = circe.version;