kdiff3-qt5: init at 1.7.0

Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
This commit is contained in:
Peter Hoeg 2017-02-02 13:01:40 +08:00
parent f66d7823ec
commit 8d803b90ac
2 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,37 @@
{
kdeDerivation, kdeWrapper, lib, fetchgit,
ecm, kdoctools, kconfig, kinit, kparts
}:
let
rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
unwrapped = kdeDerivation rec {
name = "kdiff3-${version}";
version = "1.7.0-${lib.strings.substring 0 7 rev}";
src = fetchgit {
url = "https://gitlab.com/tfischer/kdiff3";
sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
inherit rev;
};
preConfigure = "cd kdiff3";
nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ kconfig kinit kparts ];
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
maintainers = with maintainers; [ viric urkud peterhoeg ];
platforms = with platforms; linux;
};
};
in kdeWrapper {
inherit unwrapped;
targets = [ "bin/kdiff3" ];
}

View File

@ -2417,6 +2417,8 @@ with pkgs;
kronometer = qt5.callPackage ../tools/misc/kronometer { };
kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { };
peruse = qt5.callPackage ../tools/misc/peruse { };
kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };