From b12683e1748cc86a363ebe7140a575983c0d59b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2009 14:31:20 +0000
Subject: [PATCH] Added magit-mode 0.7, an Emacs mode for managing Git
 repositories.

svn path=/nixpkgs/trunk/; revision=16042
---
 .../editors/emacs-modes/magit/default.nix     | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/magit/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
new file mode 100644
index 00000000000..ea2c6f22829
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, emacs, texinfo}:
+
+stdenv.mkDerivation {
+  name = "magit-mode-0.7";
+
+  src = fetchurl {
+    url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz";
+    sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz";
+  };
+
+  buildInputs = [emacs texinfo];
+
+  meta = {
+    description = "An an interface to Git, implemented as an extension to Emacs.";
+
+    longDescription = ''
+      With Magit, you can inspect and modify your Git repositories with
+      Emacs. You can review and commit the changes you have made to the
+      tracked files, for example, and you can browse the history of past
+      changes. There is support for cherry picking, reverting, merging,
+      rebasing, and other common Git operations.
+
+      Magit is not a complete interface to Git; it just aims to make the
+      most common Git operations convenient. Thus, Magit will likely not
+      save you from learning Git itself.
+    '';
+
+    license = "GPLv3+";
+    homepage = "http://zagadka.vm.bytemark.co.uk/magit/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57c912ff7da..cda671ce961 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -946,6 +946,10 @@ let
     inherit fetchurl stdenv lzo;
   };
 
+  magit = import ../applications/editors/emacs-modes/magit {
+    inherit fetchurl stdenv emacs texinfo;
+  };
+
   man = import ../tools/misc/man {
     inherit fetchurl stdenv groff less;
   };