aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/text/kdiff3/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-04-23 20:53:34 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-04-23 20:53:34 +0200
commit5a3e454db37fd20f5432a64137c1025cf892eb85 (patch)
treeeaba3aab59bd30172ff6005d7dbf78ac1c464688 /pkgs/tools/text/kdiff3/default.nix
parent814772e93e1dd38d0a097521296350e7e0be4926 (diff)
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c72f5761642e8a664e21bb83e4b11dd9. The problem was fixed by the parent commit.
Diffstat (limited to 'pkgs/tools/text/kdiff3/default.nix')
-rw-r--r--pkgs/tools/text/kdiff3/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index e199d77e2265..bd76b89ccf74 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -22,7 +22,7 @@ let
(fetchpatch {
name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
- sha256 = "0v638rk05wz51qcqnc6blcp2v74f04wn8ifgzw7qi5vr0yfh775r";
+ sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
})
];
patchFlags = "-p 2";