Merge master into staging-next

2020-11-21 08:43:10 +01:00
parent 553b7a8bf0 65c4e2500f
commit 1ffd7cf0d6
129 changed files with 5263 additions and 10739 deletions
@@ -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 ];