diff options
author | Will Dietz <w@wdtz.org> | 2019-05-19 03:25:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-19 03:25:18 -0500 |
commit | 8932e2c30a97ed78e253dd552ac4a78bcdc5b919 (patch) | |
tree | 31c4c95bbd8669a24eb1fe1dfad7435d040eed37 | |
parent | 0bedafd57c2a3a6eed875f2120e7d463b782aff6 (diff) | |
parent | c978bb04ddd78e140a7a39dc81e3ea0f44331d3d (diff) | |
download | nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar.gz nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar.bz2 nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar.lz nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar.xz nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.tar.zst nixlib-8932e2c30a97ed78e253dd552ac4a78bcdc5b919.zip |
Merge pull request #61623 from dtzWill/update/kdiff3-1.8
kdiff3: 1.7.x -> 1.8.1
-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 514085bee64e..aa53aeb42061 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.1"; - 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 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; }; - 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 ]; |