summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2017-02-06 11:21:31 -0600
committerGitHub <noreply@github.com>2017-02-06 11:21:31 -0600
commitf0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d (patch)
treee0692206d2a0dfd8f331c3f90e71766a29c6e7bf /pkgs/top-level
parent667a78f176c9700f1872f8855505920769579269 (diff)
parent8d803b90ac81576795538b0242e68deae7145732 (diff)
downloadnixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.gz
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.bz2
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.lz
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.xz
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.tar.zst
nixlib-f0bbf73e0bbc01ddf51b4db563920fdc65bd9f7d.zip
Merge pull request #22477 from peterhoeg/f/kdiff3
kdiff3-qt5: init at 1.7.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ea9f9e6774d..d5950c36d0bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2430,6 +2430,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; };