From f150e3d3a0071210412a05ed11ef15ee5521117f Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 27 Sep 2024 18:46:36 +0000 Subject: [PATCH] calligra: move to pkgs/kde Calligra's information is generated alongside the usual KDE updates, so let's make use of them. Signed-off-by: Fernando Rodrigues --- pkgs/kde/default.nix | 1 + pkgs/{applications/office => kde/misc}/calligra/default.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{applications/office => kde/misc}/calligra/default.nix (100%) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index ee011c3a7ae8..f5092b6da53d 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -68,6 +68,7 @@ let selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub alpaka = self.callPackage ./misc/alpaka { }; + calligra = self.callPackage ./misc/calligra { }; kdiagram = self.callPackage ./misc/kdiagram { }; kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { }; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/kde/misc/calligra/default.nix similarity index 100% rename from pkgs/applications/office/calligra/default.nix rename to pkgs/kde/misc/calligra/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bdc99a11d17..f1d518468bba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28711,8 +28711,6 @@ with pkgs; calicoctl confd-calico; - calligra = libsForQt5.callPackage ../applications/office/calligra { }; - perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };