diff options
author | Will Dietz <w@wdtz.org> | 2019-05-16 09:08:33 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-05-18 01:16:15 -0500 |
commit | 9b3b2af6e750c7e7412dd30da1b0a60af00bf043 (patch) | |
tree | ddc40553697c4357439a6fe8dbeadb0ad5305462 /pkgs/tools/text/kdiff3 | |
parent | 15eb98dceced918c336599730548e289375b3929 (diff) |
kdiff3: 1.8, finally a release!
Drop git-diff patch, really hope it's not still outstanding (and it doesn't apply). cc @vcunat (who filed linked upstream issue)
Diffstat (limited to 'pkgs/tools/text/kdiff3')
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 514085bee64e6..ea50e69fa5326 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,35 +1,18 @@ { - mkDerivation, lib, fetchgit, fetchpatch, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, wrapGAppsHook, kcrash, kconfig, kinit, kparts }: mkDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-2017-02-19"; + pname = "kdiff3"; + version = "1.8"; - src = fetchgit { - # gitlab is outdated - url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; - sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; - rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54"; }; - setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; - - patches = [ - (fetchpatch { - name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2 - url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch"; - sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y"; - }) - ]; - patchFlags = "-p 2"; - - postPatch = '' - sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp - ''; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; |