summary refs log tree commit diff
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2019-11-29 11:15:30 -0800
committerMario Rodas <marsam@users.noreply.github.com>2019-11-29 11:15:30 -0800
commit90604ee2daa9175a8693eb348aec7ac81c85e8b4 (patch)
treee4df524fe864f5b5130fa2bb7f811b14d8f087b5
parent38a9a2a6711148425d7db8e5942c55294852e827 (diff)
downloadnixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar.gz
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar.bz2
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar.lz
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar.xz
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.tar.zst
nixpkgs-90604ee2daa9175a8693eb348aec7ac81c85e8b4.zip
gitAndTools.tig: 2.4.1 -> 2.5.0
-rw-r--r--pkgs/applications/version-management/git-and-tools/tig/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 59354598d00..424694d7262 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
+{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, fetchpatch
 , readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
   pname = "tig";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
+    sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf";
   };
 
   nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
       rm -f contrib/config.make-*
   '';
 
+  patches = [
+    # Fix memory leak. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/jonas/tig/commit/6202c6032f17438a2facb23f02e330b9d0566d9d.patch";
+      sha256 = "15zn8hw9y7bqa1np4mj0qnm2z86nif7qwh7wc4vgy2rwxdil85bd";
+    })
+  ];
+
   enableParallelBuilding = true;
 
   installPhase = ''