summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-10-30 14:33:53 +0100
committerPeter Simons <simons@cryp.to>2015-10-30 14:34:21 +0100
commitdd3d3110a7ff89ad839db31fbb6a8c0459acee6b (patch)
treee9a6ac58a446ecb9c81ec619182b4de10c65d20d
parent0608615f78edf6cbb2334d7d398a78ab056dcb76 (diff)
downloadnixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar.gz
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar.bz2
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar.lz
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar.xz
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.tar.zst
nixlib-dd3d3110a7ff89ad839db31fbb6a8c0459acee6b.zip
emacs-magit: update to version 2.3.0
-rw-r--r--pkgs/applications/editors/emacs-modes/magit/default.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 8d71ca582022..b5f4ac506cc4 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
 
 let
-  version = "2.2.1";
+  version = "2.3.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "magit";
     repo = "magit";
     rev = version;
-    sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz";
+    sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8";
   };
 
   buildInputs = [ emacs texinfo git ];
@@ -28,15 +28,10 @@ stdenv.mkDerivation {
     cp lisp/magit-version.el .
   '';
 
-  doCheck = false;  # one out of 5 tests fails, not sure why
+  doCheck = false;  # 2 out of 15 tests fails, not sure why
   checkTarget = "test";
   preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
 
-  # postInstall = ''
-  #   mkdir -p $out/bin
-  #   mv "bin/"* $out/bin/
-  # '';
-
   meta = {
     homepage = "https://github.com/magit/magit";
     description = "Magit, an Emacs interface to Git";