diff --git a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/akonadi-contacts.nix rename to pkgs/applications/kde/akonadi-contacts.nix diff --git a/pkgs/desktops/kde-5/applications/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/akonadi-mime.nix rename to pkgs/applications/kde/akonadi-mime.nix diff --git a/pkgs/desktops/kde-5/applications/akonadi.nix b/pkgs/applications/kde/akonadi.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/akonadi.nix rename to pkgs/applications/kde/akonadi.nix diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/applications/kde/ark/default.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/ark/default.nix rename to pkgs/applications/kde/ark/default.nix diff --git a/pkgs/desktops/kde-5/applications/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/baloo-widgets.nix rename to pkgs/applications/kde/baloo-widgets.nix diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/applications/kde/build-support/application.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kde-app.nix rename to pkgs/applications/kde/build-support/application.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix new file mode 100644 index 000000000000..e638378ddbb4 --- /dev/null +++ b/pkgs/applications/kde/default.nix @@ -0,0 +1,95 @@ +/* + +# New packages + +READ THIS FIRST + +This module is for official packages in the KDE Applications Bundle. All +available packages are listed in `./srcs.nix`, although some are not yet +packaged in Nixpkgs (see below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. A simple example package that +still shows most of the available features is in `./gwenview.nix`. + +# Updates + +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` + from the top of the Nixpkgs tree. +3. Use `nox-review wip` to check that everything builds. +4. Commit the changes and open a pull request. + +*/ + +{ + stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, + kdeDerivation, plasma5, + attica, phonon, + debug ? false, +}: + +let + mirror = "mirror://kde"; + srcs = import ./srcs.nix { inherit fetchurl mirror; }; +in + +let + + packages = self: with self; + let + callPackage = self.newScope { + kdeApp = import ./build-support/application.nix { + inherit lib kdeDerivation; + inherit debug srcs; + }; + }; + in { + kdelibs = callPackage ./kdelibs { inherit attica phonon; }; + akonadi = callPackage ./akonadi.nix {}; + akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-mime = callPackage ./akonadi-mime.nix {}; + ark = callPackage ./ark/default.nix {}; + baloo-widgets = callPackage ./baloo-widgets.nix {}; + dolphin = callPackage ./dolphin.nix {}; + dolphin-plugins = callPackage ./dolphin-plugins.nix {}; + ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; + filelight = callPackage ./filelight.nix {}; + gwenview = callPackage ./gwenview.nix {}; + kate = callPackage ./kate.nix {}; + kdenlive = callPackage ./kdenlive.nix {}; + kcalc = callPackage ./kcalc.nix {}; + kcolorchooser = callPackage ./kcolorchooser.nix {}; + kcontacts = callPackage ./kcontacts.nix {}; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; + kdf = callPackage ./kdf.nix {}; + kgpg = callPackage ./kgpg.nix {}; + khelpcenter = callPackage ./khelpcenter.nix {}; + kig = callPackage ./kig.nix {}; + kio-extras = callPackage ./kio-extras.nix {}; + kmime = callPackage ./kmime.nix {}; + kmix = callPackage ./kmix.nix {}; + kompare = callPackage ./kompare.nix {}; + konsole = callPackage ./konsole.nix {}; + kwalletmanager = callPackage ./kwalletmanager.nix {}; + libkdcraw = callPackage ./libkdcraw.nix {}; + libkexiv2 = callPackage ./libkexiv2.nix {}; + libkipi = callPackage ./libkipi.nix {}; + libkomparediff2 = callPackage ./libkomparediff2.nix {}; + marble = callPackage ./marble.nix {}; + okteta = callPackage ./okteta.nix {}; + okular = callPackage ./okular.nix {}; + print-manager = callPackage ./print-manager.nix {}; + spectacle = callPackage ./spectacle.nix { + inherit (plasma5) kscreen; + }; + + l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; }); + }; + +in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/dolphin-plugins.nix rename to pkgs/applications/kde/dolphin-plugins.nix diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/applications/kde/dolphin.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/dolphin.nix rename to pkgs/applications/kde/dolphin.nix diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/applications/kde/fetch.sh similarity index 100% rename from pkgs/desktops/kde-5/applications/fetch.sh rename to pkgs/applications/kde/fetch.sh diff --git a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/ffmpegthumbs.nix rename to pkgs/applications/kde/ffmpegthumbs.nix diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/applications/kde/filelight.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/filelight.nix rename to pkgs/applications/kde/filelight.nix diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/applications/kde/gwenview.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/gwenview.nix rename to pkgs/applications/kde/gwenview.nix diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/applications/kde/kate.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kate.nix rename to pkgs/applications/kde/kate.nix diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/applications/kde/kcalc.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kcalc.nix rename to pkgs/applications/kde/kcalc.nix diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kcolorchooser.nix rename to pkgs/applications/kde/kcolorchooser.nix diff --git a/pkgs/desktops/kde-5/applications/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kcontacts.nix rename to pkgs/applications/kde/kcontacts.nix diff --git a/pkgs/desktops/kde-5/applications/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kde-locale-4.nix rename to pkgs/applications/kde/kde-locale-4.nix diff --git a/pkgs/desktops/kde-5/applications/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kde-locale-5.nix rename to pkgs/applications/kde/kde-locale-5.nix diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix rename to pkgs/applications/kde/kdegraphics-mobipocket.nix diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix rename to pkgs/applications/kde/kdegraphics-thumbnailers.nix diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch similarity index 100% rename from pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch rename to pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch similarity index 100% rename from pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch rename to pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch similarity index 100% rename from pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch rename to pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix similarity index 97% rename from pkgs/desktops/kde-5/applications/kdelibs/default.nix rename to pkgs/applications/kde/kdelibs/default.nix index c7c8c250a838..0292b51a48d4 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, src, version, + kdeApp, lib, automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, diff --git a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix rename to pkgs/applications/kde/kdenetwork-filesharing.nix diff --git a/pkgs/desktops/kde-5/applications/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kdenlive.nix rename to pkgs/applications/kde/kdenlive.nix diff --git a/pkgs/desktops/kde-5/applications/kdf.nix b/pkgs/applications/kde/kdf.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kdf.nix rename to pkgs/applications/kde/kdf.nix diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/applications/kde/kgpg.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kgpg.nix rename to pkgs/applications/kde/kgpg.nix diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/khelpcenter.nix rename to pkgs/applications/kde/khelpcenter.nix diff --git a/pkgs/desktops/kde-5/applications/kig.nix b/pkgs/applications/kde/kig.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kig.nix rename to pkgs/applications/kde/kig.nix diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kio-extras.nix rename to pkgs/applications/kde/kio-extras.nix diff --git a/pkgs/desktops/kde-5/applications/kmime.nix b/pkgs/applications/kde/kmime.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kmime.nix rename to pkgs/applications/kde/kmime.nix diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/applications/kde/kmix.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kmix.nix rename to pkgs/applications/kde/kmix.nix diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/applications/kde/kompare.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kompare.nix rename to pkgs/applications/kde/kompare.nix diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/applications/kde/konsole.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/konsole.nix rename to pkgs/applications/kde/konsole.nix diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/kwalletmanager.nix rename to pkgs/applications/kde/kwalletmanager.nix diff --git a/pkgs/desktops/kde-5/applications/l10n.nix b/pkgs/applications/kde/l10n.nix similarity index 98% rename from pkgs/desktops/kde-5/applications/l10n.nix rename to pkgs/applications/kde/l10n.nix index f2e5f843b5d9..87e7a82ce466 100644 --- a/pkgs/desktops/kde-5/applications/l10n.nix +++ b/pkgs/applications/kde/l10n.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgs, lib }: +{ callPackage, recurseIntoAttrs, lib }: let @@ -7,7 +7,7 @@ let in -lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) { +lib.mapAttrs (name: attr: recurseIntoAttrs attr) { ar = { qt4 = callPackage (kdeLocale4 "ar" {}) {}; qt5 = callPackage (kdeLocale5 "ar" {}) {}; diff --git a/pkgs/desktops/kde-5/applications/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/libkdcraw.nix rename to pkgs/applications/kde/libkdcraw.nix diff --git a/pkgs/desktops/kde-5/applications/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/libkexiv2.nix rename to pkgs/applications/kde/libkexiv2.nix diff --git a/pkgs/desktops/kde-5/applications/libkipi.nix b/pkgs/applications/kde/libkipi.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/libkipi.nix rename to pkgs/applications/kde/libkipi.nix diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/libkomparediff2.nix rename to pkgs/applications/kde/libkomparediff2.nix diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/applications/kde/marble.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/marble.nix rename to pkgs/applications/kde/marble.nix diff --git a/pkgs/desktops/kde-5/applications/okteta.nix b/pkgs/applications/kde/okteta.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/okteta.nix rename to pkgs/applications/kde/okteta.nix diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/applications/kde/okular.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/okular.nix rename to pkgs/applications/kde/okular.nix diff --git a/pkgs/desktops/kde-5/applications/print-manager.nix b/pkgs/applications/kde/print-manager.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/print-manager.nix rename to pkgs/applications/kde/print-manager.nix diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/applications/kde/spectacle.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/spectacle.nix rename to pkgs/applications/kde/spectacle.nix diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/applications/kde/srcs.nix similarity index 100% rename from pkgs/desktops/kde-5/applications/srcs.nix rename to pkgs/applications/kde/srcs.nix diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix deleted file mode 100644 index 832b88c7e803..000000000000 --- a/pkgs/desktops/kde-5/applications/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -/* - -# New packages - -READ THIS FIRST - -This module is for official packages in the KDE Applications Bundle. All -available packages are listed in `./srcs.nix`, although some are not yet -packaged in Nixpkgs (see below). - -IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. - -Many of the packages released upstream are not yet built in Nixpkgs due to lack -of demand. To add a Nixpkgs build for an upstream package, copy one of the -existing packages here and modify it as necessary. A simple example package that -still shows most of the available features is in `./gwenview.nix`. - -# Updates - -1. Update the URL in `./fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` - from the top of the Nixpkgs tree. -3. Use `nox-review wip` to check that everything builds. -4. Commit the changes and open a pull request. - -*/ - -{ - stdenv, lib, libsForQt5, fetchurl, - kdeDerivation, plasma5, - attica, phonon, - debug ? false, -}: - -let - - mirror = "mirror://kde"; - srcs = import ./srcs.nix { inherit fetchurl mirror; }; - - packages = self: with self; { - - kdeApp = import ./kde-app.nix { - inherit lib kdeDerivation; - inherit debug srcs; - }; - - kdelibs = callPackage ./kdelibs { - inherit (srcs.kdelibs) src version; - inherit attica phonon; - }; - - akonadi = callPackage ./akonadi.nix {}; - akonadi-contacts = callPackage ./akonadi-contacts.nix {}; - akonadi-mime = callPackage ./akonadi-mime.nix {}; - ark = callPackage ./ark/default.nix {}; - baloo-widgets = callPackage ./baloo-widgets.nix {}; - dolphin = callPackage ./dolphin.nix {}; - dolphin-plugins = callPackage ./dolphin-plugins.nix {}; - ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; - filelight = callPackage ./filelight.nix {}; - gwenview = callPackage ./gwenview.nix {}; - kate = callPackage ./kate.nix {}; - kdenlive = callPackage ./kdenlive.nix {}; - kcalc = callPackage ./kcalc.nix {}; - kcolorchooser = callPackage ./kcolorchooser.nix {}; - kcontacts = callPackage ./kcontacts.nix {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; - kdf = callPackage ./kdf.nix {}; - kgpg = callPackage ./kgpg.nix {}; - khelpcenter = callPackage ./khelpcenter.nix {}; - kig = callPackage ./kig.nix {}; - kio-extras = callPackage ./kio-extras.nix {}; - kmime = callPackage ./kmime.nix {}; - kmix = callPackage ./kmix.nix {}; - kompare = callPackage ./kompare.nix {}; - konsole = callPackage ./konsole.nix {}; - kwalletmanager = callPackage ./kwalletmanager.nix {}; - libkdcraw = callPackage ./libkdcraw.nix {}; - libkexiv2 = callPackage ./libkexiv2.nix {}; - libkipi = callPackage ./libkipi.nix {}; - libkomparediff2 = callPackage ./libkomparediff2.nix {}; - marble = callPackage ./marble.nix {}; - okteta = callPackage ./okteta.nix {}; - okular = callPackage ./okular.nix {}; - print-manager = callPackage ./print-manager.nix {}; - spectacle = callPackage ./spectacle.nix { - inherit (plasma5) kscreen; - }; - - l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); - }; - -in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d310c50e0352..297aae6147e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14055,11 +14055,11 @@ with pkgs; kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - kdeApplications = import ../desktops/kde-5/applications { - inherit stdenv lib libsForQt5 fetchurl; + kdeApplications = recurseIntoAttrs (import ../applications/kde { + inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; inherit kdeDerivation plasma5; inherit attica phonon; - }; + }); kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };