diff options
| author | Bastian Köcher <git@kchr.de> | 2018-04-20 13:57:36 +0200 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-04-25 09:35:48 +0800 |
| commit | b933157f44b5b432d248fec56151ba0646a00e69 (patch) | |
| tree | 3be15b968accb2d55c7d896220064dc2373fd50a | |
| parent | 45f1205bab6650ebb33de392308922703070082e (diff) | |
| download | nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar.gz nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar.bz2 nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar.lz nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar.xz nixlib-b933157f44b5b432d248fec56151ba0646a00e69.tar.zst nixlib-b933157f44b5b432d248fec56151ba0646a00e69.zip | |
kholidays: Move from kde_applications to kde_frameworks
| -rw-r--r-- | pkgs/applications/kde/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kholidays.nix (renamed from pkgs/applications/kde/kholidays.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 36dd1773b39e..451fdbe151f4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -107,7 +107,6 @@ let kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; - kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 08eebfd83aee..f54139836b1d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -129,6 +129,7 @@ let syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; kirigami2 = callPackage ./kirigami2.nix {}; + kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix index 352bec094922..2ede69e74953 100644 --- a/pkgs/applications/kde/kholidays.nix +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, qtbase, qtdeclarative, qttools, }: @@ -8,7 +8,7 @@ mkDerivation { name = "kholidays"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; + maintainers = with lib.maintainers; [ bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtbase qtdeclarative qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc008b7beb6..78b8cff8215c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11153,7 +11153,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2; + threadweaver kirigami2 kholidays; ### KDE PLASMA 5 @@ -11163,7 +11163,7 @@ with pkgs; ### KDE APPLICATIONS inherit (kdeApplications.override { libsForQt5 = self; }) - kholidays libkdcraw libkexiv2 libkipi libkomparediff2 libksane; + libkdcraw libkexiv2 libkipi libkomparediff2 libksane; ### LIBRARIES |