From d1259ed363c67c8938c0849391e18db171df871c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 21:34:27 +0100 Subject: [PATCH] kdiff3: migrate to Qt5.15 fix homepage --- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 9921862b798..862faadea3f 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; meta = with lib; { - homepage = "http://kdiff3.sourceforge.net/"; + homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd3d15e2af..ac3c9727eb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5032,7 +5032,7 @@ in krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { };