public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdiff3: 1.8, finally a release!

Browse Source 
Drop git-diff patch, really hope it's not still outstanding
(and it doesn't apply).
cc @vcunat (who filed linked upstream issue)
This commit is contained in:
Will Dietz 2019-05-16 09:08:33 -05:00
parent 15eb98dcec
commit 9b3b2af6e7
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/text/kdiff3/default.nix
View File

@ -1,35 +1,18 @@
{ {
mkDerivation, lib, fetchgit, fetchpatch, mkDerivation, lib, fetchurl,
extra-cmake-modules, kdoctools, wrapGAppsHook, extra-cmake-modules, kdoctools, wrapGAppsHook,
kcrash, kconfig, kinit, kparts kcrash, kconfig, kinit, kparts
}: }:
mkDerivation rec { mkDerivation rec {
name = "kdiff3-${version}"; pname = "kdiff3";
version = "1.7.0-2017-02-19"; version = "1.8";
src = fetchgit { src = fetchurl {
# gitlab is outdated url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; sha256 = "083pz5c1w7l9h4sb8zz8a763yph5sk3mxnhpdykz1rrggy9f8p54";
sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
}; };
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 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; propagatedBuildInputs = [ kconfig kcrash kinit kparts ];