diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-12-09 20:43:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 20:43:15 -0500 |
| commit | 6cb987607cc71a89f7a51c0b050ccd8a828859cd (patch) | |
| tree | 843e4579bbf278720aa1e1afc9021a22af2d9c73 /pkgs | |
| parent | b4578030677a79e5be6a6245e5746ced2ee56da5 (diff) | |
| parent | 90604ee2daa9175a8693eb348aec7ac81c85e8b4 (diff) | |
| download | nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar.gz nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar.bz2 nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar.lz nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar.xz nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.tar.zst nixpkgs-6cb987607cc71a89f7a51c0b050ccd8a828859cd.zip | |
Merge pull request #74669 from r-ryantm/auto-update/tig
gitAndTools.tig: 2.4.1 -> 2.5.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/tig/default.nix | 14 |
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 = '' |