Merge branch 'kde5-perf'

Fixes #3594, reducing the evaluation time of the KDE expressions by 90%.
Fixes #8483, Qt 5 dependencies are no longer propagated automatically.

nixos/modules/services/x11/desktop-managers/kde5.nix

@@ -35,11 +35,11 @@ let
   phononBackendPackages = flip concatMap cfg.phononBackends
     (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
 
-  kf5 = plasma5.kf5;
+  kf5 = pkgs.kf5_stable;
 
-  plasma5 = pkgs.plasma5_stable;
+  plasma5 = pkgs.plasma5_stable.override { inherit kf5; };
 
-  kdeApps = pkgs.kdeApps_stable;
+  kdeApps = pkgs.kdeApps_stable.override { inherit kf5; };
 
 in
 

pkgs/applications/kde-apps-15.04/default.nix

@@ -12,416 +12,524 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, callPackage, debug ? false }:
+{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
 
-with stdenv.lib; with autonix;
+let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
 
-let kf5Orig = kf5; in
+with autonix; let inherit (stdenv) lib; in
+
+let
+  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
+  plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
 
 let
 
-  kf5 = kf5Orig.override { inherit debug qt5; };
+  kf5 = kf5_.override { inherit debug qt5; };
+  plasma5 = plasma5_.override { inherit debug kf5 qt5; };
+  qt5 = qt5_;
 
-  mirror = "mirror://kde";
+  kdeOrL10nPackage = name: pkg:
+    assert (builtins.isAttrs pkg);
+    if lib.hasPrefix "kde-l10n" pkg.name
+      then l10nPackage name pkg
+    else kdePackage name pkg;
 
-  renames =
+  kdePackage = name: pkg:
-    (builtins.removeAttrs
+    let defaultOverride = drv: drv // {
-      (import ./renames.nix {})
+          setupHook = ./setup-hook.sh;
-      ["Backend" "CTest"])
+          cmakeFlags =
-    // {
+            (drv.cmakeFlags or [])
-      "KDE4" = "kdelibs";
+            ++ [ "-DBUILD_TESTING=OFF" ]
-      "KF5KDEGames" = "libkdegames";
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-      "Kexiv2" = "libkexiv2";
+          meta = {
-      "Kdcraw" = "libkdcraw";
+            license = with stdenv.lib.licenses; [
-      "Kipi" = "libkipi";
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-      "LibKonq" = "kde-baseapps";
+            ];
-      "Marble" = "marble";
+            platforms = stdenv.lib.platforms.linux;
-    };
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
 
-  mkDerivation = drv: kf5.mkDerivation (drv // {
+  l10nPackage = name: pkg:
-    preHook = (drv.preHook or "") + ''
+    let nameVersion = builtins.parseDrvName pkg.name;
-      addQt4Plugins() {
-        if [[ -d "$1/lib/qt4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
 
-        if [[ -d "$1/lib/kde4/plugins" ]]; then
+        pkgQt4 = pkg // {
-            propagatedUserEnvPkgs+=" $1"
+          name = "${nameVersion.name}-qt4-${nameVersion.version}";
-        fi
+          buildInputs = [ "kdelibs" "qt4" ];
-      }
+          nativeBuildInputs = [ "cmake" "gettext" "perl" ];
+          propagatedBuildInputs = [];
+          propagatedNativeBuildInputs = [];
+          propagatedUserEnvPkgs = [];
+        };
+        drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
+          preConfigure = (drv.preConfigure or "") + ''
+            cd 4/
+          '';
+        });
 
-      envHooks+=(addQt4Plugins)
+        pkgQt5 = pkg // {
-    '';
+          name = "${nameVersion.name}-qt5-${nameVersion.version}";
+          buildInputs = [ "kdoctools" "ki18n" ];
+          nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
+          propagatedBuildInputs = [];
+          propagatedNativeBuildInputs = [];
+          propagatedUserEnvPkgs = [];
+        };
+        drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
+          preConfigure = (drv.preConfigure or "") + ''
+            cd 5/
+          '';
+        });
+    in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames =
+          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./renames.json));
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdeOrL10nPackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
+
+  kde4Package = pkg: overrideScope pkg (with kde4; {
+    inherit akonadi baloo kactivities libkdegames libkmahjongg;
+    kde4 = self.kdelibs;
   });
 
   scope =
+    # KDE Frameworks 5
+    kf5 //
     # packages in this collection
-    (mapAttrs (dep: name: kdeApps."${name}") renames) //
+    self //
-    # packages from KDE Frameworks 5
+    {
-    kf5.scope //
+      kf5baloo = plasma5.baloo;
+      kf5kdcraw = self.libkdcraw;
+      kf5kdegames = self.libkdegames;
+      kf5kipi = self.libkipi;
+      libkonq = self.kde-baseapps;
+    } //
+    # packages requiring same Qt 5
+    (with pkgs; {
+      accountsqt5 = accounts-qt.override { inherit qt5; };
+      dbusmenuqt = libdbusmenu_qt;
+      grantlee5 = grantlee5.override { inherit qt5; };
+      mlt = pkgs.mlt-qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      qca-qt5 = qca-qt5.override { inherit qt5; };
+      qt5script = qt5.script;
+      qt5x11extras = qt5.x11extras;
+      signonqt5 = signon.override { inherit qt5; };
+      telepathyqt5 = telepathy_qt5.override { inherit qt5; };
+    }) //
     # packages from nixpkgs
-    (with pkgs;
+    (with pkgs; {
-      {
+      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
-        ACL = acl;
+              djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
-        AccountsQt5 = accounts-qt.override { inherit qt5; };
+              exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
-        Akonadi = kde4.akonadi;
+              grantlee gsl hunspell ilmbase intltool jasper lcms2
-        Alsa = alsaLib;
+              libaccounts-glib libgcrypt libotr libraw libssh libspectre
-        Automoc4 = automoc4;
+              libvncserver libical networkmanager openal opencv
-        Avahi = avahi;
+              openexr perl phonon pkgconfig polkit_qt4 prison python qca2
-        BISON = bison;
+              qimageblitz qjson qt4 samba saneBackends soprano speechd
-        Baloo = kde4.baloo;
+              strigi taglib udev xlibs xplanet xscreensaver xz;
-        Boost = boost156;
+      alsa = alsaLib;
-        CFitsio = cfitsio;
+      assuan = libassuan;
-        CUPS = cups;
+      boost = boost156;
-        Canberra = libcanberra;
+      canberra = libcanberra;
-        Cdparanoia = cdparanoia;
+      eigen3 = eigen;
-        DBusMenuQt = libdbusmenu_qt;
+      epub = ebook_tools;
-        DjVuLibre = djvulibre;
+      gif = giflib;
-        ENCHANT = enchant;
+      gphoto2 = libgphoto2;
-        EPub = ebook_tools;
+      hupnp = herqq;
-        Eigen2 = eigen2;
+      indi = indilib;
-        Eigen3 = eigen;
+      jpeg = libjpeg;
-        Exiv2 = exiv2;
+      ldap = openldap;
-        FAM = fam;
+      libattica = attica;
-        FFmpeg = ffmpeg;
+      musicbrainz3 = libmusicbrainz;
-        Flac = flac;
+      oggvorbis = libvorbis;
-        FLEX = flex;
+      poppler = poppler_qt4;
-        Freetype = freetype;
+      pulseaudio = libpulseaudio;
-        GMP = gmp;
+      qalculate = libqalculate;
-        Gettext = gettext;
+      sasl2 = cyrus_sasl;
-        Gpgme = gpgme;
+      shareddesktopontologies = shared_desktop_ontologies;
-        Gphoto2 = libgphoto2;
+      sharedmimeinfo = shared_mime_info;
-        Grantlee = grantlee;
+      sndfile = libsndfile;
-        Grantlee5 = grantlee5;
+      tiff = libtiff;
-        GSL = gsl;
+      telepathyqt4 = telepathy_qt;
-        HUNSPELL = hunspell;
+      tunepimp = libtunepimp;
-        HUpnp = herqq;
+      usb = libusb;
-        INDI = indilib;
+      xsltproc = libxslt;
-        Intltool = intltool;
+    });
-        Jasper = jasper;
-        KActivities = kde4.kactivities;
-        KDEGames = kde4.libkdegames;
-        LCMS2 = lcms2;
-        Ldap = openldap;
-        LibAttica = attica;
-        LibGcrypt = libgcrypt;
-        LibKMahjongg = kde4.libkmahjongg;
-        LibSSH = libssh;
-        LibSpectre = libspectre;
-        LibVNCServer = libvncserver;
-        Libical = libical;
-        MusicBrainz3 = libmusicbrainz;
-        NetworkManager = networkmanager;
-        OggVorbis = libvorbis;
-        OpenAL = openal;
-        OpenEXR = openexr;
-        Poppler = poppler_qt4;
-        Prison = prison;
-        PulseAudio = libpulseaudio;
-        PythonLibrary = python;
-        Qalculate = libqalculate;
-        QCA2 = qca2;
-        Qca-qt5 = qca-qt5.override { inherit qt5; };
-        QImageBlitz = qimageblitz;
-        QJSON = qjson;
-        Qt4 = qt4;
-        Samba = samba;
-        Sasl2 = cyrus_sasl;
-        SharedDesktopOntologies = shared_desktop_ontologies;
-        SignOnQt5 = signon.override { inherit qt5; };
-        SndFile = libsndfile;
-        Speechd = speechd;
-        TIFF = libtiff;
-        Taglib = taglib;
-        TelepathyQt4 = telepathy_qt;
-        TelepathyQt5 = telepathy_qt5;
-        TunePimp = libtunepimp;
-        UDev = udev;
-        USB = libusb;
-        Xplanet = xplanet;
-        Xscreensaver = xscreensaver;
-        Xsltproc = libxslt;
-      }
-    );
 
-  qt5Only = tgt:
+  self =
-    let qt4Deps = [ "KDE4" "Phonon" ];
+    (builtins.removeAttrs super [
-    in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
+      "artikulate" # build failure; wrong boost?
+      "kde-dev-scripts" "kde-dev-utils" # docbook errors
+      "kdewebdev" # unknown build failure
+      "kde-l10n-sr" # missing CMake command
+    ]) // {
+      audiocd-kio = kde4Package super.audiocd-kio;
 
-  preResolve = super:
+      amor = kde4Package super.amor;
-    fold (f: x: f x) super
-      [
-        (qt5Only "kmix")
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["artikulate"]) # build failure, wrong boost?
-        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
-        (blacklist ["kdewebdev"]) # unknown build failure
-      ];
 
-  l10nPkgQt4 = orig:
+      ark = extendDerivation (kde4Package super.ark) {
-    let drvName = builtins.parseDrvName orig.name; in
+        buildInputs = [ pkgs.makeWrapper ];
-    mkDerivation {
+        # runtime dependency
-      name = "${drvName.name}-qt4-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = [ kdeApps.kdelibs ];
-      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
-      preConfigure = ''
-        cd 4/
-      '';
-    };
-
-  l10nPkgQt5 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt5-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = with kf5; [ kdoctools ki18n ];
-      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
-      preConfigure = ''
-        cd 5/
-      '';
-    };
-
-  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
-
-  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
-
-  postResolve = super:
-    (removeL10nPkgs super) // {
-
-      ark = with pkgs; super.ark // {
-        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
         postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
+          wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
         '';
       };
 
-      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
+      cervisia = kde4Package super.cervisia;
-        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
+
+      dolphin-plugins = kde4Package super.dolphin-plugins;
+
+      dragon = kde4Package super.dragon;
+
+      ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
+        nativeBuildInputs = [ scope.pkgconfig ];
       };
 
-      kaccounts-providers = super.kaccounts-providers // {
+      juk = kde4Package super.juk;
-        buildInputs = super.kaccounts-providers.buildInputs
+
-          ++ (with pkgs; [ libaccounts-glib ]);
+      jovie = kde4Package super.jovie;
+
+      kaccessible = kde4Package super.kaccessible;
+
+      kaccounts-providers = extendDerivation super.kaccounts-providers {
+        buildInputs = [ pkgs.libaccounts-glib ];
+        # hard-coded install path
         preConfigure = ''
-          ${super.kaccounts-providers.preConfigure or ""}
           substituteInPlace webkit-options/CMakeLists.txt \
-            --replace "/etc/signon-ui/webkit-options.d/" "$out/etc/signon-ui/webkit-options.d/"
+            --replace "/etc/signon-ui/webkit-options.d/" \
+                      "$out/etc/signon-ui/webkit-options.d/"
         '';
       };
 
-      kalzium = with pkgs; super.kalzium // {
+      kajongg = kde4Package super.kajongg;
-        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
+
+      kalzium = extendDerivation (kde4Package super.kalzium) {
+        nativeBuildInputs = [ scope.pkgconfig ];
       };
 
-      kate = super.kate // {
+      kamera = kde4Package super.kamera;
-        buildInputs =
+
-          super.kate.buildInputs
+      kate = extendDerivation super.kate {
-          ++ (with kf5; [ kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets
+        buildInputs = with scope; [
-                          kio kparts ktexteditor kwindowsystem kxmlgui ]);
+          kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
-        nativeBuildInputs = super.kate.nativeBuildInputs ++ (with kf5; [ kdoctools ]);
+          kparts ktexteditor kwindowsystem kxmlgui
+        ];
+        nativeBuildInputs = [ scope.kdoctools ];
       };
 
-      kde-runtime = with pkgs; super.kde-runtime // {
+      kcachegrind = kde4Package super.kcachegrind;
-        buildInputs =
+
-          super.kde-runtime.buildInputs ++ [libcanberra];
+      kcolorchooser = kde4Package super.kcolorchooser;
-        nativeBuildInputs =
+
-          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
+      kde-base-artwork = kde4Package super.kde-base-artwork;
-        NIX_CFLAGS_COMPILE =
+
-          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
+      kde-baseapps = kde4Package super.kde-baseapps;
-          + " -I${ilmbase}/include/OpenEXR";
+
+      kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
+        buildInputs = [ scope.canberra ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+        # cmake does not detect path to `ilmbase`
+        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
+        # some components of this package have been replaced in other packages
         meta = { priority = 10; };
       };
 
-      kde-workspace = with pkgs; super.kde-workspace // {
+      kde-wallpapers = kde4Package super.kde-wallpapers;
-        buildInputs = with xlibs;
+
-          super.kde-workspace.buildInputs
+      kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
-          ++
+        buildInputs = with scope.xlibs; [
-          [
+            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
+        ];
-            xcbutilrenderutil
+        nativeBuildInputs = [ scope.pkgconfig ];
-          ];
+        # some components of this package have been replaced in other packages
-        nativeBuildInputs =
-          super.kde-workspace.nativeBuildInputs
-          ++ [ pkgconfig ];
         meta = { priority = 10; };
       };
 
-      kdelibs = with pkgs; super.kdelibs // {
+      kdeartwork = kde4Package super.kdeartwork;
-        buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
 
-        nativeBuildInputs =
+      kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
-          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
 
-        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+      kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
 
-        propagatedBuildInputs =
+      kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
-          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
 
-        propagatedNativeBuildInputs =
+      kdelibs = extendDerivation super.kdelibs {
-          super.kdelibs.propagatedNativeBuildInputs
+        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
-          ++ [ automoc4 cmake perl shared_mime_info ];
+        propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+        propagatedNativeBuildInputs = with scope; [
+          automoc4 cmake perl sharedmimeinfo
+        ];
 
         patches = [ ./kdelibs/polkit-install.patch ];
 
+        # cmake does not detect path to `ilmbase`
+        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
+
         cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+          "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+          "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
           "-DHUPNP_ENABLED=ON"
           "-DWITH_SOLID_UDISKS2=ON"
           "-DKDE_DEFAULT_HOME=.kde"
         ];
       };
 
-      kdenlive =
+      kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
-        let mlt = pkgs.mlt-qt5.override { inherit qt5; };
+
-        in super.kdenlive // {
+      kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
-          buildInputs = super.kdenlive.buildInputs ++ [ mlt ];
+
+      kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
+
+      kdepim = extendDerivation (kde4Package super.kdepim) {
+        buildInputs = with scope; [ gpgme assuan ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
+
+      kdepim-runtime = kde4Package super.kdepim-runtime;
+
+      kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
+
+      kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
+
+      kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
+
+      kdesdk-thumbnailers =
+        extendDerivation (kde4Package super.kdesdk-thumbnailers) {
+          nativeBuildInputs = [ scope.gettext ];
         };
 
-      kdepim = with pkgs; super.kdepim // {
+      kdf = kde4Package super.kdf;
-        buildInputs =
+
-          super.kdepim.buildInputs ++ [ gpgme libassuan ];
+      kfloppy = kde4Package super.kfloppy;
-        nativeBuildInputs =
+
-          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
+      kgamma = kde4Package super.kgamma;
+
+      kget = kde4Package super.kget;
+
+      kgoldrunner = kde4Package super.kgoldrunner;
+
+      kgpg = extendDerivation (kde4Package super.kgpg) {
+        buildInputs = [ scope.boost ];
       };
 
-      kdepimlibs = with pkgs; super.kdepimlibs // {
+      khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
-        nativeBuildInputs =
-          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
-      };
 
-      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
+      kigo = kde4Package super.kigo;
-        nativeBuildInputs =
-          super.kdesdk-thumbnailers.nativeBuildInputs
-          ++ [gettext];
-      };
 
-      kgpg = with pkgs; super.kgpg // {
+      kiriki = kde4Package super.kiriki;
-        buildInputs = super.kgpg.buildInputs ++ [boost];
-      };
 
-      khangman = super.khangman // {
+      klickety = kde4Package super.klickety;
-        buildInputs =
-          super.khangman.buildInputs
-          ++ [ kf5.kio ];
-      };
 
-      kmix = with pkgs; super.kmix // {
+      kmag = kde4Package super.kmag;
-        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
+
+      kmahjongg = kde4Package super.kmahjongg;
+
+      kmix = extendDerivation super.kmix {
+        nativeBuildInputs = [ scope.pkgconfig ];
         cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
       };
 
-      kmousetool = with pkgs; super.kmousetool // {
+      kmousetool = extendDerivation (kde4Package super.kmousetool) {
-        buildInputs = with xlibs;
+        buildInputs = with scope.xlibs; [ libXtst libXt ];
-          super.kmousetool.buildInputs
-          ++ [libXtst libXt];
       };
 
-      kremotecontrol = with pkgs; super.kremotecontrol // {
+      kmouth = kde4Package super.kmouth;
-        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
+
+      knavalbattle = kde4Package super.knavalbattle;
+
+      kolf = kde4Package super.kolf;
+
+      kolourpaint = kde4Package super.kolourpaint;
+
+      konquest = kde4Package super.konquest;
+
+      kopete = kde4Package super.kopete;
+
+      kppp = kde4Package super.kppp;
+
+      kqtquickcharts = kde4Package super.kqtquickcharts;
+
+      krdc = kde4Package super.krdc;
+
+      kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
+        buildInputs = [ scope.xlibs.libXtst ];
       };
 
-      krfb = super.krfb // {
+      kreversi = kde4Package super.kreversi;
-        buildInputs =
+
-          super.krfb.buildInputs
+      krfb = extendDerivation (kde4Package super.krfb) {
-          ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals];
+        buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ];
       };
 
-      kstars = super.kstars // {
+      ksaneplugin = kde4Package super.ksaneplugin;
-        buildInputs =
+
-          super.kstars.buildInputs
+      kscd = kde4Package super.kscd;
-          ++ (with kf5; [ kparts ])
+
-          ++ [ pkgs.cfitsio ];
+      ksirk = kde4Package super.ksirk;
+
+      ksnakeduel = kde4Package super.ksnakeduel;
+
+      ksnapshot = kde4Package super.ksnapshot;
+
+      kspaceduel = kde4Package super.kspaceduel;
+
+      kstars = extendDerivation super.kstars {
+        buildInputs = with scope; [ kparts cfitsio ];
       };
 
-      ktp-accounts-kcm = super.ktp-accounts-kcm // {
+      ksudoku = kde4Package super.ksudoku;
-        buildInputs =
+
-          super.ktp-accounts-kcm.buildInputs
+      ksystemlog = kde4Package super.ksystemlog;
-          ++ [ pkgs.libaccounts-glib ];
+
+      ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
+        buildInputs = [ scope.libaccounts-glib ];
       };
 
-      ktp-common-internals = super.ktp-common-internals // {
+      ktp-common-internals = extendDerivation super.ktp-common-internals {
-        buildInputs =
+        buildInputs = with scope; [ kdelibs4support kparts libotr ];
-          super.ktp-common-internals.buildInputs
-          ++ (with kf5; [ kdelibs4support kparts ])
-          ++ [ pkgs.libotr ]; # needed for ktp-text-ui
       };
 
-      ktp-text-ui = super.ktp-text-ui // {
+      ktp-text-ui = extendDerivation super.ktp-text-ui {
-        buildInputs =
+        buildInputs = [ scope.kdbusaddons ];
-          super.ktp-text-ui.buildInputs
-          ++ (with kf5; [ kdbusaddons ]);
       };
 
-      lokalize = super.lokalize // {
+      ktuberling = kde4Package super.ktuberling;
-        buildInputs =
+
-          super.lokalize.buildInputs
+      ktux = kde4Package super.ktux;
-          ++ [ kf5.kdbusaddons ];
+
+      kubrick = kde4Package super.kubrick;
+
+      kuser = kde4Package super.kuser;
+
+      kwalletmanager = kde4Package super.kwalletmanager;
+
+      lokalize = extendDerivation super.lokalize {
+        buildInputs = [ scope.kdbusaddons ];
       };
 
-      libkdcraw = with pkgs; super.libkdcraw // {
+      libkcddb = kde4Package super.libkcddb;
-        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
+
-        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
+      libkcompactdisc = kde4Package super.libkcompactdisc;
+
+      libkdcraw = extendDerivation super.libkdcraw {
+        buildInputs = with scope; [ kdelibs libraw ];
+        nativeBuildInputs = [ scope.pkgconfig ];
       };
 
-      libkexiv2 = with pkgs; super.libkexiv2 // {
+      libkdeedu = kde4Package super.libkdeedu;
-        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
+
+      libkexiv2 = extendDerivation super.libkexiv2 {
+        buildInputs = with scope; [ exiv2 kdelibs ];
       };
 
-      libkface = with pkgs; super.libkface // {
+      libkface = extendDerivation super.libkface {
-        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
+        buildInputs = with scope; [ kdelibs opencv ];
       };
 
-      libkgeomap = super.libkgeomap // {
+      libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
         cmakeFlags =
-          (super.libkgeomap.cmakeFlags or [])
+          [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
-          ++ [
-            "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
-          ];
       };
 
-      libkipi = with pkgs; super.libkipi // {
+      libkipi = extendDerivation super.libkipi {
-        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
+        buildInputs = [ scope.kdelibs ];
       };
 
-      libksane = with pkgs; super.libksane // {
+      libksane = extendDerivation super.libksane {
-        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
+        buildInputs = with scope; [ kdelibs saneBackends];
       };
 
-      okular = super.okular // {
+      lskat = kde4Package super.lskat;
-        nativeBuildInputs =
+
-          super.okular.nativeBuildInputs
+      marble = kde4Package super.marble;
-          ++ [ pkgs.pkgconfig ];
+
+      mplayerthumbs = kde4Package super.mplayerthumbs;
+
+      okular = extendDerivation (kde4Package super.okular) {
+        nativeBuildInputs = [ scope.pkgconfig ];
       };
 
-      rocs = super.rocs // {
+      pairs = kde4Package super.pairs;
-        buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
+
+      palapeli = kde4Package super.palapeli;
+
+      picmi = kde4Package super.picmi;
+
+      poxml = kde4Package super.poxml;
+
+      rocs = extendDerivation super.rocs {
+        buildInputs = [ scope.kdelibs4support ];
       };
 
-      signon-kwallet-extension =
+      signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
-        let signon = pkgs.signon.override { inherit qt5; };
+        buildInputs = [ scope.signonqt5 ];
-        in super.signon-kwallet-extension // {
+        preConfigure = ''
-          buildInputs = super.signon-kwallet-extension.buildInputs ++ [ signon ];
+          sed -i src/CMakeLists.txt \
-          preConfigure = ''
+              -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
-            ${super.signon-kwallet-extension.preConfigure or ""}
+        '';
-            sed -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions," \
+      };
-                -i src/CMakeLists.txt
+
-          '';
+      superkaramba = kde4Package super.superkaramba;
-        };
+
+      svgpart = kde4Package super.svgpart;
+
+      sweeper = kde4Package super.sweeper;
+
+      umbrello = kde4Package super.umbrello;
+
+      zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
 
     };
 
-  l10nManifest =
+in self
-    filterAttrs
-      (n: v: hasPrefix "kde-l10n" n)
-      (importManifest ./manifest.nix { inherit mirror; });
-
-  kdeApps = generateCollection ./. {
-    inherit mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in kdeApps // (mapAttrs l10nPkg l10nManifest)

pkgs/applications/kde-apps-15.04/dependencies.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

pkgs/applications/kde-apps-15.04/kf5-renames.json

@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}

pkgs/applications/kde-apps-15.04/manifest.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      "${KDE_MIRROR}/stable/applications/15.04.0/" \
-      "${KDE_MIRROR}/stable/applications/15.04.1/" \
-      "${KDE_MIRROR}/stable/applications/15.04.2/" \
-      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi

pkgs/applications/kde-apps-15.04/packages.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/applications/15.04.2/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json

pkgs/applications/kde-apps-15.04/plasma5-renames.json

@@ -0,0 +1,20 @@
+{
+    "kf5sysguard": "libksysguard",
+    "kf5baloo": "baloo",
+    "krunnerappdbusinterface": "plasma-workspace",
+    "screensaverdbusinterface": "plasma-workspace",
+    "ctest": "kdeplasma-addons",
+    "kf5filemetadata": "kfilemetadata",
+    "kwindbusinterface": "kwin",
+    "kf5activitiesexperimentalstats": "plasma-desktop",
+    "khotkeysdbusinterface": "khotkeys",
+    "libkworkspace": "plasma-workspace",
+    "libtaskmanager": "plasma-workspace",
+    "backend": "powerdevil",
+    "kf5screen": "libkscreen",
+    "ksmserverdbusinterface": "plasma-workspace",
+    "kf5wayland": "kwayland",
+    "kdecoration2": "kdecoration",
+    "kf5bluezqt": "bluez-qt",
+    "oxygenfont": "oxygen-fonts"
+}

pkgs/applications/kde-apps-15.04/renames.json

@@ -0,0 +1,31 @@
+{
+    "libkomparediff2": "libkomparediff2",
+    "kdegames": "libkdegames",
+    "ksane": "libksane",
+    "ctest": "sweeper",
+    "kastencore": "okteta",
+    "kastengui": "okteta",
+    "gpgmepp": "kdepimlibs",
+    "oktetacore": "okteta",
+    "kf5kmahjongglib": "libkmahjongg",
+    "oktetagui": "okteta",
+    "libkcompactdisc": "libkcompactdisc",
+    "libkdeedu": "libkdeedu",
+    "kaccounts": "kaccounts-integration",
+    "kastencontrollers": "okteta",
+    "backend": "kde-workspace",
+    "ktp": "ktp-common-internals",
+    "kdepimlibs": "kdepimlibs",
+    "qjdns": "kopete",
+    "libkeduvocdocument": "libkeduvocdocument",
+    "oktetakastencore": "okteta",
+    "libkcddb": "libkcddb",
+    "oktetakastengui": "okteta",
+    "kde4workspace": "kde-workspace",
+    "jdns": "kopete",
+    "okular": "okular",
+    "qmobipocket": "kdegraphics-mobipocket",
+    "kdeclarative": "kdelibs",
+    "analitza5": "analitza",
+    "oktetakastencontrollers": "okteta"
+}

pkgs/applications/kde-apps-15.04/renames.nix

@@ -1,34 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Analitza5" = "analitza";
-"Backend" = "kde-workspace";
-"CTest" = "sweeper";
-"ECM" = "extra-cmake-modules";
-"Gpgmepp" = "kdepimlibs";
-"JDns" = "kopete";
-"KAccounts" = "kaccounts-integration";
-"KDE4Workspace" = "kde-workspace";
-"KDEGames" = "libkdegames";
-"KDeclarative" = "kdelibs";
-"KF5KMahjongglib" = "libkmahjongg";
-"KSane" = "libksane";
-"KTp" = "ktp-common-internals";
-"KastenControllers" = "okteta";
-"KastenCore" = "okteta";
-"KastenGui" = "okteta";
-"KdepimLibs" = "kdepimlibs";
-"LibKEduVocDocument" = "libkeduvocdocument";
-"LibKdeEdu" = "libkdeedu";
-"LibKompareDiff2" = "libkomparediff2";
-"Libkcddb" = "libkcddb";
-"Libkcompactdisc" = "libkcompactdisc";
-"OktetaCore" = "okteta";
-"OktetaGui" = "okteta";
-"OktetaKastenControllers" = "okteta";
-"OktetaKastenCore" = "okteta";
-"OktetaKastenGui" = "okteta";
-"Okular" = "okular";
-"QJDns" = "kopete";
-"QMobipocket" = "kdegraphics-mobipocket";
-}

pkgs/applications/kde-apps-15.04/setup-hook.sh

@@ -1 +1,12 @@
 addToSearchPath XDG_DATA_DIRS @out@/share
+
+addQt4Plugins() {
+  if [[ -d "$1/lib/qt4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+
+  if [[ -d "$1/lib/kde4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+}
+envHooks+=(addQt4Plugins)

pkgs/build-support/autonix/default.nix

@@ -1,5 +1,8 @@
-{ bash, callPackage, coreutils, fetchurl, findutils, nix, runCommand, stdenv
+{ pkgs }:
-, substituteAll, wget, writeText }:
+
+let inherit (pkgs) bash coreutils findutils nix wget;
+    inherit (pkgs) callPackage fetchurl runCommand stdenv substituteAll writeText;
+in
 
 /* autonix is a collection of tools to automate packaging large collections
  * of software, particularly KDE. It consists of three components:
@@ -10,10 +13,18 @@
  *      expressions from the output of the previous steps.
  */
 
-with stdenv.lib;
+let inherit (stdenv) lib; in
 
 let
 
+  resolveDeps = scope: deps:
+    let resolve = dep:
+          let res = scope."${dep}" or [];
+          in if lib.isList res then res else [res];
+    in lib.concatMap resolve deps;
+
+in rec {
+
   /* Download the packages into the Nix store, compute their hashes,
    * and generate a package manifest in ./manifest.nix.
    */
@@ -32,148 +43,94 @@ let
           chmod +x $out
         '';
 
-  /* Convert a manifest.nix file to XML to be read by autonix-deps. */
+  mkPackage = callPackage: defaultOverride: name: pkg: let drv =
-  writeManifestXML = filename:
+    { mkDerivation, fetchurl, scope }:
-    let
-      generateStores = mapAttrs (n: pkg: pkg.store);
-      manifest = importManifest filename { mirror = ""; };
-      stores = generateStores manifest;
-    in
-      writeText "manifest.xml" (builtins.toXML stores);
 
-  /* Generate a set of Nix expressions for the collection, given a
+    mkDerivation (defaultOverride {
-   * manifest.nix, dependencies.nix, and renames.nix in the same directory.
+      inherit (pkg) name;
-   */
-  generateCollection = dir: # path to directory
-    { mirror # mirror to download packages from
-    , mkDerivation ? mkDerivation
-    , preResolve ? id # modify package set before dependency resolution
-    , postResolve ? id # modify package set after dependency resolution
-    , renames ? {}
-    , scope ? {}
-    }:
-    let
 
-      fix = f: let x = f x; in x;
+      src = fetchurl pkg.src;
 
-      resolvePkg = name:
+      buildInputs = resolveDeps scope pkg.buildInputs;
-        mapAttrs (attr: if isDepAttr attr then resolveDeps scope else id);
+      nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
+      propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
+      propagatedNativeBuildInputs =
+        resolveDeps scope pkg.propagatedNativeBuildInputs;
+      propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
 
-      resolve = mapAttrs resolvePkg;
+      enableParallelBuilding = true;
+    });
+  in callPackage drv {};
 
-      derive = mapAttrs (name: mkDerivation);
+  renameDeps = renames: lib.mapAttrs (name: pkg:
+    let breakCycles = lib.filter (dep: dep != name);
+        rename = dep: renames."${dep}" or dep;
+    in pkg // {
+      buildInputs = breakCycles (map rename pkg.buildInputs);
+      nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
+      propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
+      propagatedNativeBuildInputs =
+        breakCycles (map rename pkg.propagatedNativeBuildInputs);
+      propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
+    });
 
-      renames_ =
+  propagateDeps = propagated: lib.mapAttrs (name: pkg:
-        if renames == {} then (import (dir + "/renames.nix") {}) else renames;
+    let isPropagated = dep: lib.elem dep propagated;
+        isNotPropagated = dep: !(isPropagated dep);
+    in pkg // {
+      buildInputs = lib.filter isNotPropagated pkg.buildInputs;
+      nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
+      propagatedBuildInputs =
+        pkg.propagatedBuildInputs
+        ++ lib.filter isPropagated pkg.buildInputs;
+      propagatedNativeBuildInputs =
+        pkg.propagatedNativeBuildInputs
+        ++ lib.filter isPropagated pkg.nativeBuildInputs;
+    });
 
-      packages = importPackages dir renames_ { inherit mirror; };
+  nativeDeps = native: lib.mapAttrs (name: pkg:
+    let isNative = dep: lib.elem dep native;
+        isNotNative = dep: !(isNative dep);
+    in pkg // {
+      buildInputs = lib.filter isNotNative pkg.buildInputs;
+      nativeBuildInputs =
+        pkg.nativeBuildInputs
+        ++ lib.filter isNative pkg.buildInputs;
+      propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
+      propagatedNativeBuildInputs =
+        pkg.propagatedNativeBuildInputs
+        ++ lib.filter isNative pkg.propagatedBuildInputs;
+    });
 
-    in derive (postResolve (resolve (preResolve packages)));
+  userEnvDeps = user: lib.mapAttrs (name: pkg:
+    let allDeps = with pkg; lib.concatLists [
+          buildInputs
+          nativeBuildInputs
+          propagatedBuildInputs
+          propagatedNativeBuildInputs
+        ];
+    in assert (lib.isList allDeps); pkg // {
+      propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
+    });
 
-  pkgAttrName = pkg: (builtins.parseDrvName pkg.name).name;
+  overrideDerivation = pkg: f: pkg.override (super: super // {
-  pkgVersion = pkg: (builtins.parseDrvName pkg.name).version;
+    mkDerivation = drv: super.mkDerivation (drv // f drv);
+  });
 
-  depAttrNames = [
+  extendDerivation = pkg: attrs:
-    "buildInputs" "nativeBuildInputs"
+    let mergeAttrBy = lib.mergeAttrBy // {
-    "propagatedBuildInputs" "propagatedNativeBuildInputs"
+          propagatedNativeBuildInputs = a: b: a ++ b;
-    "propagatedUserEnvPkgs"
+          NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
-  ];
+          cmakeFlags = a: b: a ++ b;
-
-  isDepAttr = name: builtins.elem name depAttrNames;
-
-  removePkgDeps = deps:
-    let removeDepsIfDepAttr = attr: value:
-          if isDepAttr attr then fold remove value deps else value;
-    in mapAttrs removeDepsIfDepAttr;
-
-  hasDep = dep: pkg:
-    let depAttrs = attrValues (filterAttrs (n: v: isDepAttr n) pkg);
-        allDeps = concatLists depAttrs;
-    in elem dep allDeps;
-
-  importManifest = path: { mirror }:
-    let
-      uniqueNames = manifest:
-        unique (map pkgAttrName manifest);
-
-      versionsOf = manifest: name:
-        filter (pkg: pkgAttrName pkg == name) manifest;
-
-      bestVersions = manifest:
-        let best = versions:
-              let
-                strictlyLess = a: b:
-                  builtins.compareVersions (pkgVersion a) (pkgVersion b) > 0;
-                sorted = sort strictlyLess versions;
-              in head sorted;
-        in map (name: best (versionsOf manifest name)) (uniqueNames manifest);
-
-      withNames = manifest:
-        builtins.listToAttrs
-          (map (p: nameValuePair (toLower (pkgAttrName p)) p) manifest);
-
-      orig = import path { inherit stdenv fetchurl mirror; };
-    in
-      fold (f: x: f x) orig [ withNames bestVersions ];
-
-  importPackages = path: renames: manifestScope:
-    let
-
-      # Do not allow any package to depend on itself.
-      breakRecursion =
-        let removeSelfDep = pkg:
-              mapAttrs
-                (n: if isDepAttr n
-                      then filter (dep: dep != pkg && renamed dep != pkg)
-                    else id);
-        in mapAttrs removeSelfDep;
-
-      renamed = dep: renames."${dep}" or dep;
-
-      manifest = importManifest (path + "/manifest.nix") manifestScope;
-
-      deps = import (path + "/dependencies.nix") {};
-
-      mkPkg = name: manifest:
-        {
-          inherit (manifest) name src;
-          inherit (deps."${name}")
-            buildInputs nativeBuildInputs propagatedBuildInputs
-            propagatedNativeBuildInputs propagatedUserEnvPkgs;
         };
+        mergeAttrsByFunc = sets:
+          let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
+          in builtins.removeAttrs merged ["mergeAttrBy"];
+    in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
 
-    in breakRecursion (mapAttrs mkPkg manifest);
+  overrideScope = pkg: fnOrSet: pkg.override (super: super // {
-
+    scope = if builtins.isFunction fnOrSet
-  mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
+              then super.scope // fnOrSet super.scope
-
+            else super.scope // fnOrSet;
-  resolveDeps = scope:
+  });
-    let resolveDeps_go = dep:
-          let res = scope."${dep}" or [];
-          in if isList res then res else [res];
-    in concatMap resolveDeps_go;
-
-  userEnvPkg = dep:
-    mapAttrs
-      (name: pkg: pkg // {
-        propagatedUserEnvPkgs =
-          (pkg.propagatedUserEnvPkgs or [])
-          ++ optional (hasDep dep pkg) dep;
-      });
-
-in
-{
-  inherit generateCollection;
-  inherit importManifest;
-  inherit isDepAttr;
-  inherit manifest;
-  inherit removePkgDeps;
-  inherit resolveDeps;
-  inherit userEnvPkg;
-  inherit writeManifestXML;
-
-  blacklist = names: pkgs:
-    let
-      removeDeps = deps: mapAttrs (name: removePkgDeps deps);
-      removePkgs = names: pkgs: builtins.removeAttrs pkgs names;
-    in removeDeps names (removePkgs names pkgs);
 }

pkgs/build-support/autonix/manifest.sh

@@ -4,38 +4,41 @@
 
 @wget@/bin/wget -nH -r -c --no-parent $*
 
-cat >../manifest.nix <<EOF
+cat >../manifest.json <<EOF
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
 [
 EOF
 
 workdir=$(pwd)
+sep=""
 
 @findutils@/bin/find . | while read path; do
     if [[ -f "${path}" ]]; then
+        [[ -n "${sep}" ]] && echo "$sep" >>../manifest.json
         url="${path:2}"
         # Sanitize file name
-        name=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
+        filename=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
+        nameversion="${filename%.tar.*}"
+        name="${nameversion%-*}"
         dirname=$(@coreutils@/bin/dirname "${path}")
-        mv "${workdir}/${path}" "${workdir}/${dirname}/${name}"
+        mv "${workdir}/${path}" "${workdir}/${dirname}/${filename}"
         # Prefetch and hash source file
-        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${name}")
+        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${filename}")
-        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$name")
+        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$filename")
-        cat >>../manifest.nix <<EOF
+        cat >>../manifest.json <<EOF
   {
-    name = stdenv.lib.nameFromURL "${name}" ".tar";
+    "name": "${nameversion}",
-    store = "${store}";
+    "store": "${store}",
-    src = fetchurl {
+    "src": {
-      url = "\${mirror}/${url}";
+      "url": "${url}",
-      sha256 = "${sha256}";
+      "sha256": "${sha256}",
-      name = "${name}";
+      "name": "${filename}"
-    };
+    }
   }
 EOF
+        sep=","
     fi
 done
 
-echo "]" >>../manifest.nix
+echo "]" >>../manifest.json
 
 cd ..

pkgs/desktops/plasma-5.3/default.nix

@@ -12,181 +12,247 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }:
+{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
 
-with stdenv.lib; with autonix;
+let inherit (pkgs) autonix stdenv symlinkJoin; in
 
-let kf5Orig = kf5; in
+with autonix; let inherit (stdenv) lib; in
+
+let
+  kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
+  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
 
 let
 
-  kf5 = kf5Orig.override { inherit debug qt5; };
+  kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
+  kf5 = kf5_.override { inherit debug qt5; };
+  qt5 = qt5_;
 
-  mirror = "mirror://kde";
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
 
-  renames =
+  super =
-    builtins.removeAttrs
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
-      (import ./renames.nix {})
+        mirrorUrl = n: pkg: pkg // {
-      ["Backend" "CTest"];
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames =
+          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./renames.json));
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
 
   scope =
+    # KDE Frameworks 5
+    kf5 //
     # packages in this collection
-    (mapAttrs (dep: name: plasma5."${name}") renames) //
+    self //
-    # packages from KDE Frameworks 5
-    kf5.scope //
     # packages pinned to this version of Qt 5
     {
-      LibBlueDevil = pkgs.libbluedevil;
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-      PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
+      libbluedevil = pkgs.libbluedevil.override { inherit qt5; };
-      PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
+      poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
+      qt5 = qt5.base;
+      qt5core = qt5.base;
+      qt5dbus = qt5.base;
+      qt5gui = qt5.base;
+      qt5linguisttools = qt5.tools;
+      qt5qml = [qt5.declarative qt5.graphicaleffects];
+      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
+      qt5script = qt5.script;
+      qt5svg = qt5.svg;
+      qt5tools = qt5.tools;
+      qt5webkitwidgets = qt5.webkit;
+      qt5widgets = qt5.base;
+      qt5x11extras = qt5.x11extras;
+      qt5xmlpatterns = qt5.xmlpatterns;
     } //
     # packages from nixpkgs
-    (with pkgs;
+    (with pkgs; {
-      {
+      inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype
-        inherit epoxy;
+              glib gnugrep gnused gtk2 gtk3 libinput libssh
-        Epub = ebook_tools;
+              modemmanager openconnect openexr pam pango qt4 samba
-        Exiv2 = exiv2;
+              socat substituteAll taglib utillinux wayland xapian
-        FFmpeg = ffmpeg;
+              xkeyboard_config xlibs xorg;
-        FONTFORGE_EXECUTABLE = fontforge;
+      boost = boost156;
-        Freetype = freetype;
+      canberra = libcanberra;
-        GTK2 = gtk2;
+      epub = ebook_tools;
-        GTK3 = gtk3;
+      fontforge_executable = fontforge;
-        Libinput = libinput;
+      mobilebroadbandproviderinfo = mobile_broadband_provider_info;
-        LibSSH = libssh;
+      mtp = libmtp;
-        PulseAudio = libpulseaudio;
+      pulseaudio = libpulseaudio;
-        Taglib = taglib;
+      qalculate = libqalculate;
-        USB = libusb;
+      shareddesktopontologies = shared_desktop_ontologies;
-        Wayland = wayland;
+      sharedmimeinfo = shared_mime_info;
-        Xapian = xapian;
+      usb = libusb;
-      }
+    });
-    );
 
-  preResolve = super:
+  self = super // {
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["bluedevil"])
-      ];
 
-  postResolve = super:
+    bluez-qt = overrideDerivation super.bluez-qt (drv: {
-    (builtins.removeAttrs super ["breeze"]) // {
+      preConfigure = ''
+        substituteInPlace CMakeLists.txt \
+          --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      '';
+    });
 
-      bluez-qt = super.bluez-qt // {
+    breeze =
-        preConfigure = ''
+      let
-          substituteInPlace CMakeLists.txt \
+        version = (builtins.parseDrvName super.breeze.name).version;
-            --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-        '';
-      };
 
-      breeze-qt4 = with pkgs; super.breeze // {
+        breeze-qt4 = overrideDerivation super.breeze (drv: {
-        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
+          name = "breeze-qt4-${version}";
-        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
+          buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
-        nativeBuildInputs = [ cmake pkgconfig ];
+          nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ];
-        cmakeFlags =
+          cmakeFlags = [
-          [
             "-DUSE_KDE4=ON"
-            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+            "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
           ];
-      };
+        });
 
-      breeze-qt5 = with pkgs; super.breeze // {
+        breeze-qt5 = overrideDerivation super.breeze (drv: {
-        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
+          name = "breeze-qt5-${version}";
-        buildInputs = with kf5; with plasma5;
+          buildInputs = with kf5; with self; [
-          [
+            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
-            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration kguiaddons
+            kguiaddons frameworkintegration ki18n kwindowsystem qt5.base
-            frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
+            qt5.x11extras
           ];
-        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
+          nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ];
-        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+          cmakeFlags = [ "-DUSE_KDE4=OFF" ];
-      };
+        });
+      in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
 
-      kde-gtk-config = with pkgs; super.kde-gtk-config // {
+    kde-gtk-config = extendDerivation super.kde-gtk-config {
-        NIX_CFLAGS_COMPILE =
+      NIX_CFLAGS_COMPILE = with scope;
-          (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "")
+        lib.concatStringsSep " " [
-          + " -I${cairo}/include/cairo"
+          "-I${cairo}/include/cairo"
-          + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include"
+          "-I${gtk2}/include/gtk-2.0"
-          + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"
+          "-I${gtk2}/lib/gtk-2.0/include"
-          + " -I${pango}/include/pango-1.0";
+          "-I${glib}/include/glib-2.0"
-      };
+          "-I${glib}/lib/glib-2.0/include"
-
+          "-I${pango}/include/pango-1.0"
-      kfilemetadata = super.kfilemetadata // {
-        buildInputs = with pkgs; super.kfilemetadata.buildInputs ++ [ attr ];
-      };
-
-      kwin = with pkgs; super.kwin // {
-        buildInputs = with xlibs;
-          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
-        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-      };
-
-      libkscreen = with pkgs; super.libkscreen // {
-        buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr];
-      };
-
-      plasma-desktop = with pkgs; super.plasma-desktop // {
-        buildInputs = with xlibs;
-          super.plasma-desktop.buildInputs ++
-          [ pkgs.libcanberra libxkbfile libXcursor libXft ];
-        patches = [
-          ./plasma-desktop/plasma-desktop-hwclock.patch
-          ./plasma-desktop/plasma-desktop-zoneinfo.patch
-          (substituteAll {
-            src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
-            xkb = pkgs.xkeyboard_config;
-          })
         ];
-        preConfigure = ''
-          substituteInPlace kcms/dateandtime/helper.cpp \
-            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
-        '';
-      };
-
-      plasma-workspace = with pkgs; super.plasma-workspace // {
-        patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
-        buildInputs = with xlibs;
-          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
-
-        inherit (pkgs) bash gnused gnugrep socat;
-        inherit (kf5) kconfig kinit kservice;
-        inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-        kde_workspace = kdeApps.kde-workspace;
-        qt5tools = qt5.tools;
-        dbus_tools = pkgs.dbus.tools;
-
-        postPatch = ''
-          substituteAllInPlace startkde/startkde.cmake
-          substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-            --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-        '';
-        preConfigure = ''
-          substituteInPlace startkde/startkde.cmake \
-            --subst-var-by plasmaWorkspace "$out"
-        '';
-      };
-
-      powerdevil = with pkgs; super.powerdevil // {
-        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
-      };
-
-      sddm-kcm = with pkgs; super.sddm-kcm // {
-        buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
-      };
-
-      /*
-      user-manager = super.user-manager // {
-        buildInputs = with pkgs; super.user-manager.buildInputs ++ [ libpwquality ];
-      };
-      */
-
     };
 
-  plasma5 = generateCollection ./. {
+    kfilemetadata = extendDerivation super.kfilemetadata {
-    inherit (kf5) mkDerivation;
+      buildInputs = [ scope.attr ];
-    inherit mirror preResolve postResolve renames scope;
+    };
+
+    kwin = extendDerivation super.kwin {
+      buildInputs = with scope.xlibs; [ libICE libSM libXcursor ];
+      patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
+    };
+
+    libkscreen = extendDerivation super.libkscreen {
+      buildInputs = [ scope.xlibs.libXrandr];
+    };
+
+    plasma-desktop = extendDerivation super.plasma-desktop {
+      buildInputs = with scope;
+        [ canberra ]
+        ++ (with xlibs; [ libxkbfile libXcursor libXft ]);
+      patches = [
+        (scope.substituteAll {
+          src = ./plasma-desktop/plasma-desktop-hwclock.patch;
+          hwclock = "${scope.utillinux}/sbin/hwclock";
+        })
+        ./plasma-desktop/plasma-desktop-zoneinfo.patch
+        (scope.substituteAll {
+          src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
+          xkb = scope.xkeyboard_config;
+        })
+      ];
+      NIX_CFLAGS_COMPILE = with scope.xlibs;
+        lib.concatStringsSep " " [
+          "-I${xf86inputsynaptics}/include/xorg"
+          "-I${xf86inputevdev}/include/xorg"
+          "-I${xorgserver}/include/xorg"
+        ];
+      cmakeFlags = with scope.xlibs; [
+        "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
+        "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
+      ];
+    };
+
+    plasma-workspace = extendDerivation super.plasma-workspace {
+      patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
+      buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
+
+      inherit (scope) bash gnused gnugrep socat;
+      inherit (scope) kconfig kinit kservice qt5tools;
+      inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+      dbus_tools = scope.dbus.tools;
+      kde_workspace = kdeApps.kde-workspace;
+      postPatch = ''
+        substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+          --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        substituteAllInPlace startkde/startkde.cmake
+      '';
+    };
+
+    powerdevil = extendDerivation super.powerdevil {
+      buildInputs = [ scope.xlibs.libXrandr ];
+    };
+
+    sddm-kcm = extendDerivation super.sddm-kcm {
+      buildInputs = [ scope.xlibs.libXcursor ];
+    };
+
   };
 
-in
+in self
-  plasma5 // {
-    inherit kf5 scope;
-  }

pkgs/desktops/plasma-5.3/dependencies.nix

@@ -1,300 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5DBusAddons" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bluedevil = {
-    buildInputs = [ "ECM" "KDED" "KF5" "KF5BluezQt" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  bluez-qt = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickTest" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5KCMUtils" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-cli-tools = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdecoration = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5NewStuff" "KF5Plasma" "KF5Purpose" "KF5QUIET" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kfilemetadata = {
-    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khelpcenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khotkeys = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Package" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio-extras = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kmenuedit = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscreen = {
-    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksshaskpass = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwayland = {
-    buildInputs = [ "ECM" "EGL" "Qt5" "Qt5COMPONENT" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Private" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5_check_private" "Wayland" "WaylandScanner" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "Threads" "UDev" "Wayland" "X11" "X11_XCB" "XCB" "XKB" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwrited = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  milou = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  muon = {
-    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecoration2" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-fonts = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-desktop = {
-    buildInputs = [ "Boost" "Canberra" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "Synaptics" "USB" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-mediacenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Baloo" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5FileMetaData" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Xml" "Taglib" "mockcpp" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-nm = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-sdk = {
-    buildInputs = [ "ActiveApp" "ECM" "KDevPlatform" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "QGpgme" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "GIT_EXECUTABLE_FOUND" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NO_MODULE" "KF5NetworkManagerQt" "KF5NewStuff" "KF5NotifyConfig" "KF5Package" "KF5Plasma" "KF5PlasmaQuick" "KF5Prison" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KF5XmlRpcClient" "KWinDBusInterface" "Phonon4Qt5" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5SysGuard" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace-wallpapers = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  polkit-kde-agent = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Auth" "KF5Config" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Screen" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "UDev" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sddm-kcm = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  systemsettings = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  user-manager = {
-    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "PWQuality" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}

pkgs/desktops/plasma-5.3/dependencies.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

pkgs/desktops/plasma-5.3/kf5-renames.json

@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}

pkgs/desktops/plasma-5.3/manifest.nix

@@ -1,328 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/wksay8grc0ihprrjkvfwaa5n0v1dsn7p-breeze-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/breeze-5.3.1.tar.xz";
-      sha256 = "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5";
-      name = "breeze-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "baloo-5.9.1.tar.xz" ".tar";
-    store = "/nix/store/yljbiij3svkkmmqpwqxyc5gf8p4gz9zl-baloo-5.9.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/baloo-5.9.1.tar.xz";
-      sha256 = "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n";
-      name = "baloo-5.9.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8p1spxbb4iv5wrccipby7khh6r5pj4gb-ksshaskpass-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz";
-      sha256 = "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2";
-      name = "ksshaskpass-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscreen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/0gf4avv67cspclipvs1934fa9vn5bday-kscreen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz";
-      sha256 = "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr";
-      name = "kscreen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwayland-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/fqs8y8fmkk23biqlicq50m281jf45qbj-kwayland-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz";
-      sha256 = "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f";
-      name = "kwayland-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "muon-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/glhhnkdnn4sancq176mwd3pdw51xg58s-muon-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/muon-5.3.1.tar.xz";
-      sha256 = "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk";
-      name = "muon-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/s676r82b3lpr3fzrqcw0srl8zx9mj57l-khelpcenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz";
-      sha256 = "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2";
-      name = "khelpcenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/his4ak4djxslvmrdznyzf3v6mr3aq40s-kdeplasma-addons-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz";
-      sha256 = "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv";
-      name = "kdeplasma-addons-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "systemsettings-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8fyfslw9ip7fsn6gb55v6i1cxajgxmjb-systemsettings-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz";
-      sha256 = "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0";
-      name = "systemsettings-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/flpcnl0mn3mma12nkgymabjgzm1yc4kf-kinfocenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz";
-      sha256 = "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a";
-      name = "kinfocenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkscreen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/3i82s0x8hsi0q9hyp8m42m8nxcm6cwx5-libkscreen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz";
-      sha256 = "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l";
-      name = "libkscreen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksysguard-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8jaxispzwkpdy6kazyhdy6k00f0s7dla-libksysguard-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz";
-      sha256 = "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym";
-      name = "libksysguard-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/p6x58nfjkml2125rpvkr7zcvrv11fn1l-kmenuedit-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz";
-      sha256 = "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz";
-      name = "kmenuedit-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/g9r436iff0714c2ya9xbm0sgd4gdiaq5-plasma-mediacenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz";
-      sha256 = "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8";
-      name = "plasma-mediacenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mifrpgvf29kzr7n4lk1xq8s1b3a1d29q-plasma-sdk-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz";
-      sha256 = "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs";
-      name = "plasma-sdk-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwrited-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/agrv0yx7fzkjyx8b4bl0anbhi99v6l6y-kwrited-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz";
-      sha256 = "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8";
-      name = "kwrited-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khotkeys-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/m1v47sjjn9hz8pdfzql5xx9r0j1zpd4q-khotkeys-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz";
-      sha256 = "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv";
-      name = "khotkeys-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/r8sbla68dniy9snbni1g4h9rwwm5bghh-plasma-nm-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz";
-      sha256 = "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k";
-      name = "plasma-nm-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdecoration-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/g9163zl8sjxnr32mmy70cbw0a0arsm8c-kdecoration-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz";
-      sha256 = "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn";
-      name = "kdecoration-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8z7cjvfh9bw6402ccipzpgfh4a5rwvmd-oxygen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz";
-      sha256 = "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9";
-      name = "oxygen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/safa43z9955m484jnfagz4rxby5jhn9l-kde-gtk-config-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz";
-      sha256 = "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l";
-      name = "kde-gtk-config-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluez-qt-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/s8k9h017za3z3j3h046ialysxxna2avs-bluez-qt-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz";
-      sha256 = "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l";
-      name = "bluez-qt-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/z9hb5dcjbvnrrkhba58vbhism9djavh9-polkit-kde-agent-1-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz";
-      sha256 = "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c";
-      name = "polkit-kde-agent-1-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/gfah83qmrzhfjxjvgaczz4bggyvxqq2l-kde-cli-tools-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz";
-      sha256 = "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1";
-      name = "kde-cli-tools-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mhvhgh8n3a6dzjsxzgp8ynsryv3y54kv-sddm-kcm-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz";
-      sha256 = "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9";
-      name = "sddm-kcm-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "powerdevil-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/y571p4chd574qvzjbc7pbbixsb7g4g45-powerdevil-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz";
-      sha256 = "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l";
-      name = "powerdevil-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/kxn9mq9hrqzwpw8ldxqjdaxm5zqnq1jb-plasma-workspace-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz";
-      sha256 = "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1";
-      name = "plasma-workspace-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "milou-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/02qx55q40iwpwwdr5dmnpdg5hhzcdb7a-milou-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/milou-5.3.1.tar.xz";
-      sha256 = "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a";
-      name = "milou-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksysguard-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/m8q2mc88168lkh4j3jxqjyshf0h5d7gs-ksysguard-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz";
-      sha256 = "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj";
-      name = "ksysguard-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/bilfn2r9akz2mxyl03q1a9i8nndbabhg-plasma-desktop-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz";
-      sha256 = "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp";
-      name = "plasma-desktop-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/0b3mjqqacgl23xqkhimqpgswwvsqz7bc-kwin-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwin-5.3.1.tar.xz";
-      sha256 = "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36";
-      name = "kwin-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mfn2ga4yr0v8pgknsxsgnvxayn6p7sal-plasma-workspace-wallpapers-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz";
-      sha256 = "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y";
-      name = "plasma-workspace-wallpapers-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.1.tar.xz" ".tar";
-    store = "/nix/store/pshcx9qvc0z4w486q4a51ygm86p7w06a-kfilemetadata-5.9.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz";
-      sha256 = "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs";
-      name = "kfilemetadata-5.9.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-extras-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/gy53gcnhk83ab62a2w1x0lm7lxxkn9wh-kio-extras-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz";
-      sha256 = "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87";
-      name = "kio-extras-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluedevil-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/v3k1px6zx4dqz77s0l48lky1zh22c2ps-bluedevil-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz";
-      sha256 = "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl";
-      name = "bluedevil-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/lbvr2fw8361mmd8gpqk9m917qmg8h381-oxygen-fonts-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz";
-      sha256 = "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv";
-      name = "oxygen-fonts-5.3.1.tar.xz";
-    };
-  }
-]

pkgs/desktops/plasma-5.3/packages.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/plasma/5.3.1/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json

pkgs/desktops/plasma-5.3/renames.json

@@ -0,0 +1,20 @@
+{
+    "kf5sysguard": "libksysguard",
+    "kf5baloo": "baloo",
+    "krunnerappdbusinterface": "plasma-workspace",
+    "screensaverdbusinterface": "plasma-workspace",
+    "ctest": "kdeplasma-addons",
+    "kf5filemetadata": "kfilemetadata",
+    "kwindbusinterface": "kwin",
+    "kf5activitiesexperimentalstats": "plasma-desktop",
+    "khotkeysdbusinterface": "khotkeys",
+    "libkworkspace": "plasma-workspace",
+    "libtaskmanager": "plasma-workspace",
+    "backend": "powerdevil",
+    "kf5screen": "libkscreen",
+    "ksmserverdbusinterface": "plasma-workspace",
+    "kf5wayland": "kwayland",
+    "kdecoration2": "kdecoration",
+    "kf5bluezqt": "bluez-qt",
+    "oxygenfont": "oxygen-fonts"
+}

pkgs/desktops/plasma-5.3/renames.nix

@@ -1,23 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "powerdevil";
-"CTest" = "kdeplasma-addons";
-"ECM" = "extra-cmake-modules";
-"KDecoration2" = "kdecoration";
-"KF5ActivitiesExperimentalStats" = "plasma-desktop";
-"KF5Baloo" = "baloo";
-"KF5BluezQt" = "bluez-qt";
-"KF5FileMetaData" = "kfilemetadata";
-"KF5Screen" = "libkscreen";
-"KF5SysGuard" = "libksysguard";
-"KF5Wayland" = "kwayland";
-"KHotKeysDBusInterface" = "khotkeys";
-"KRunnerAppDBusInterface" = "plasma-workspace";
-"KSMServerDBusInterface" = "plasma-workspace";
-"KWinDBusInterface" = "kwin";
-"LibKWorkspace" = "plasma-workspace";
-"LibTaskManager" = "plasma-workspace";
-"OxygenFont" = "oxygen-fonts";
-"ScreenSaverDBusInterface" = "plasma-workspace";
-}

pkgs/development/libraries/kde-frameworks-5.10/default.nix

@@ -12,199 +12,206 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
+{ pkgs, newScope, qt5 ? null, debug ? false }:
 
-with stdenv.lib; with autonix;
+let inherit (pkgs) autonix stdenv symlinkJoin; in
+
+with autonix; let inherit (stdenv) lib; in
+
+let
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
 
 let
 
-  mkDerivation = drv:
+  qt5 = qt5_;
-    let inherit (builtins.parseDrvName drv.name) version; in
-    stdenv.mkDerivation
-      (drv // {
-        setupHook = ./setup-hook.sh;
 
-        enableParallelBuilding = drv.enableParallelBuilding or true;
+  super =
-        cmakeFlags =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
-          (drv.cmakeFlags or [])
+        mirrorUrl = n: pkg: pkg // {
-          ++ [ "-DBUILD_TESTING=OFF" ]
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+        };
+        renames = builtins.fromJSON (builtins.readFile ./renames.json);
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
 
-        meta =
+  kdePackage = name: pkg:
-          {
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
             license = with stdenv.lib.licenses; [
               lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
             ];
             platforms = stdenv.lib.platforms.linux;
             maintainers = with stdenv.lib.maintainers; [ ttuegel ];
             homepage = "http://www.kde.org";
-            inherit version;
+          };
-            branch = intersperse "." (take 2 (splitString "." version));
+        };
-          } // (drv.meta or {});
+        callPackage = newScope {
-      });
+          inherit (stdenv) mkDerivation;
-
+          inherit (pkgs) fetchurl;
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
 
   scope =
     # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
+    self //
     # packages pinned to this version of Qt 5
     {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5.base;
-      Qt5Core = qt5.base;
-      Qt5DBus = qt5.base;
-      Qt5Gui = qt5.base;
-      Qt5LinguistTools = qt5.tools;
-      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
-      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
-      Qt5Script = qt5.script;
-      Qt5Svg = qt5.svg;
-      Qt5WebkitWidgets = qt5.webkit;
-      Qt5Widgets = qt5.base;
-      Qt5X11Extras = qt5.x11extras;
-      Qt5XmlPatterns = qt5.xmlpatterns;
       dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
+      qt5 = qt5.base;
+      qt5core = qt5.base;
+      qt5dbus = qt5.base;
+      qt5gui = qt5.base;
+      qt5linguisttools = qt5.tools;
+      qt5qml = [qt5.declarative qt5.graphicaleffects];
+      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
+      qt5script = qt5.script;
+      qt5svg = qt5.svg;
+      qt5webkitwidgets = qt5.webkit;
+      qt5widgets = qt5.base;
+      qt5x11extras = qt5.x11extras;
+      qt5xmlpatterns = qt5.xmlpatterns;
     } //
     # packages from the nixpkgs collection
     (with pkgs;
       {
-        Boost = boost155;
+        inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
-        inherit cmake;
+                libgcrypt libgit2 modemmanager networkmanager perl
-        inherit epoxy;
+                perlPackages qimageblitz xlibs zlib;
-        GIF = giflib;
+        boost = boost156;
-        GLIB2 = glib;
+        gif = giflib;
-        Gpgme = gpgme;
+        glib2 = glib;
-        JPEG = libjpeg;
+        jpeg = libjpeg;
-        LibGcrypt = libgcrypt;
+        libintl = gettext;
-        LibGit2 = libgit2;
+        liblzma = lzma;
-        LibIntl = gettext;
+        pythoninterp = python;
-        LibLZMA = lzma;
+        pythonlibrary = python;
-        ModemManager = modemmanager;
+        sharedmimeinfo = shared_mime_info;
-        NetworkManager = networkmanager;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
       }
     );
 
-  mirror = "mirror://kde";
+  self = super // {
-
+    extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
-  preResolve = super:
+      buildInputs = [];
-    fold (f: x: f x) super
+      nativeBuildInputs = [];
-      [
+      propagatedBuildInputs = [];
-        (userEnvPkg "SharedMimeInfo")
+      propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        (userEnvPkg "SharedDesktopOntologies")
+      propagatedUserEnvPkgs = [];
-      ];
+      cmakeFlags = ["-DBUILD_TESTING=OFF"];
-
+      patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
-  postResolve = super:
+      meta = {
-    super // {
+        license = stdenv.lib.licenses.bsd2;
-      extra-cmake-modules = {
+        platforms = stdenv.lib.platforms.linux;
-        inherit (super.extra-cmake-modules) name src;
+        maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-
+        homepage = "http://www.kde.org";
-        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
-          ];
-        meta =
-          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
-          {
-            license = stdenv.lib.licenses.bsd2;
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          };
-      };
-
-      frameworkintegration = super.frameworkintegration // {
-        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
-      };
-
-      kauth = super.kauth // {
-        buildInputs =
-          super.kauth.buildInputs
-          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        propagatedNativeBuildInputs = [ perl perlPackages.URI ];
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; };
-
-      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      ktexteditor = super.ktexteditor // {
-        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-      };
-
-      networkmanager-qt = super.networkmanager-qt // {
-        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
       };
+    });
 
+    frameworkintegration = extendDerivation super.frameworkintegration {
+      buildInputs = [ scope.xlibs.libXcursor ];
     };
 
-  kf5 = generateCollection ./. {
+    kauth = extendDerivation super.kauth {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
+      buildInputs = [ scope.polkit_qt5 ];
+      patches = [ ./kauth/kauth-policy-install.patch ];
+    };
+
+    kcmutils = extendDerivation super.kcmutils {
+      patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
+    };
+
+    kconfigwidgets = extendDerivation super.kconfigwidgets {
+      patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
+    };
+
+    kdelibs4support = extendDerivation super.kdelibs4support {
+      buildInputs = [ scope.networkmanager scope.xlibs.libSM ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+      ];
+    };
+
+    kdoctools = extendDerivation super.kdoctools {
+      propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+        "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
+      ];
+      patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
+    };
+
+    ki18n = extendDerivation super.ki18n {
+      propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
+    };
+
+    kimageformats = extendDerivation super.kimageformats {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
+    };
+
+    kinit = extendDerivation super.kinit {
+      patches = [./kinit/0001-kinit-libpath.patch];
+    };
+
+    kpackage = extendDerivation super.kpackage {
+      patches = [ ./kpackage/0001-allow-external-paths.patch ];
+    };
+
+    kservice = extendDerivation super.kservice {
+      buildInputs = [ scope.kwindowsystem ];
+      patches = [
+        ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+        ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+      ];
+    };
+
+    ktexteditor = extendDerivation super.ktexteditor {
+      patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+    };
+
+    networkmanager-qt = extendDerivation super.networkmanager-qt {
+      propagatedBuildInputs = [ scope.networkmanager ];
+    };
   };
 
-in
+in self
-
-  kf5 // { inherit mkDerivation qt5 scope; }

pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix

@@ -1,524 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WidgetsAddons" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Package" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5Service" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ActiveApp" "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Package" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5Package" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Archive" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "KF5DocTools" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Service" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpeople = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" "UTEMPTER" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5Sonnet" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5ConfigWidgets" "Qt5DBus" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlrpcclient = {
-    buildInputs = [ "ECM" "KF5I18n" "KF5KIO" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  modemmanager-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  networkmanager-qt = {
-    buildInputs = [ "ECM" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" "KF5Service" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}

pkgs/development/libraries/kde-frameworks-5.10/manifest.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-      "${KDE_MIRROR}/stable/frameworks/5.10/" \
-      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi

pkgs/development/libraries/kde-frameworks-5.10/packages.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/frameworks/5.10/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json

pkgs/development/libraries/kde-frameworks-5.10/renames.json

@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}

pkgs/development/libraries/kde-frameworks-5.10/renames.nix

@@ -1,72 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5ActivitiesExperimentalStats" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5ModemManagerQt" = "modemmanager-qt";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5People" = "kpeople";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-"KF5XmlRpcClient" = "kxmlrpcclient";
-}

pkgs/development/libraries/qt-5/5.4/default.nix

@@ -27,9 +27,14 @@ with autonix;
 with stdenv.lib;
 
 let
-  manifest =
+  srcs =
-    importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
+    let
-  srcs = mapAttrs (name: manifest: manifest.src) manifest;
+      manifest = builtins.fromJSON (builtins.readFile ./manifest.json);
+      mirror = "http://download.qt.io";
+      fetch = src: fetchurl (src // { url = "${mirror}/${src.url}"; });
+      mkPair = pkg: nameValuePair (builtins.parseDrvName pkg.name).name (fetch pkg.src);
+      pairs = map mkPair manifest;
+    in listToAttrs pairs;
 
   version = "5.4.2";
 

pkgs/development/libraries/qt-5/5.4/manifest.json

@@ -0,0 +1,301 @@
+[
+  {
+    "name": "qtbase-opensource-src-5.4.2",
+    "store": "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz",
+      "sha256": "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z",
+      "name": "qtbase-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtenginio-opensource-src-5.4.2",
+    "store": "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz",
+      "sha256": "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn",
+      "name": "qtenginio-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtserialport-opensource-src-5.4.2",
+    "store": "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz",
+      "sha256": "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck",
+      "name": "qtserialport-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtscript-opensource-src-5.4.2",
+    "store": "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz",
+      "sha256": "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0",
+      "name": "qtscript-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebchannel-opensource-src-5.4.2",
+    "store": "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn",
+      "name": "qtwebchannel-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwinextras-opensource-src-5.4.2",
+    "store": "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0",
+      "name": "qtwinextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebsockets-opensource-src-5.4.2",
+    "store": "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz",
+      "sha256": "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4",
+      "name": "qtwebsockets-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmultimedia-opensource-src-5.4.2",
+    "store": "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj",
+      "name": "qtmultimedia-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtgraphicaleffects-opensource-src-5.4.2",
+    "store": "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+      "sha256": "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs",
+      "name": "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtxmlpatterns-opensource-src-5.4.2",
+    "store": "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+      "sha256": "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa",
+      "name": "qtxmlpatterns-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttranslations-opensource-src-5.4.2",
+    "store": "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz",
+      "sha256": "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls",
+      "name": "qttranslations-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdeclarative-opensource-src-5.4.2",
+    "store": "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz",
+      "sha256": "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p",
+      "name": "qtdeclarative-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-opensource-src-5.4.2",
+    "store": "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy",
+      "name": "qtwebkit-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquick1-opensource-src-5.4.2",
+    "store": "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz",
+      "sha256": "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp",
+      "name": "qtquick1-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquickcontrols-opensource-src-5.4.2",
+    "store": "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz",
+      "sha256": "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877",
+      "name": "qtquickcontrols-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtimageformats-opensource-src-5.4.2",
+    "store": "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb",
+      "name": "qtimageformats-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdoc-opensource-src-5.4.2",
+    "store": "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz",
+      "sha256": "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8",
+      "name": "qtdoc-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwayland-opensource-src-5.4.2",
+    "store": "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz",
+      "sha256": "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0",
+      "name": "qtwayland-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmacextras-opensource-src-5.4.2",
+    "store": "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80",
+      "name": "qtmacextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtactiveqt-opensource-src-5.4.2",
+    "store": "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz",
+      "sha256": "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla",
+      "name": "qtactiveqt-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtlocation-opensource-src-5.4.2",
+    "store": "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz",
+      "sha256": "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw",
+      "name": "qtlocation-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtconnectivity-opensource-src-5.4.2",
+    "store": "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs",
+      "name": "qtconnectivity-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtx11extras-opensource-src-5.4.2",
+    "store": "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn",
+      "name": "qtx11extras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttools-opensource-src-5.4.2",
+    "store": "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz",
+      "sha256": "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd",
+      "name": "qttools-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsensors-opensource-src-5.4.2",
+    "store": "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz",
+      "sha256": "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf",
+      "name": "qtsensors-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebengine-opensource-src-5.4.2",
+    "store": "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz",
+      "sha256": "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8",
+      "name": "qtwebengine-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsvg-opensource-src-5.4.2",
+    "store": "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz",
+      "sha256": "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz",
+      "name": "qtsvg-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qt5-opensource-src-5.4.2",
+    "store": "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz",
+      "sha256": "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44",
+      "name": "qt5-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-examples-opensource-src-5.4.2",
+    "store": "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+      "sha256": "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8",
+      "name": "qtwebkit-examples-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtandroidextras-opensource-src-5.4.2",
+    "store": "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx",
+      "name": "qtandroidextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+]

pkgs/development/libraries/qt-5/5.4/manifest.nix

@@ -1,274 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz";
-      sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z";
-      name = "qtbase-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz";
-      sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn";
-      name = "qtenginio-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz";
-      sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck";
-      name = "qtserialport-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz";
-      sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0";
-      name = "qtscript-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn";
-      name = "qtwebchannel-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0";
-      name = "qtwinextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz";
-      sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4";
-      name = "qtwebsockets-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj";
-      name = "qtmultimedia-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-      sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs";
-      name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-      sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa";
-      name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz";
-      sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls";
-      name = "qttranslations-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz";
-      sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p";
-      name = "qtdeclarative-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy";
-      name = "qtwebkit-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz";
-      sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp";
-      name = "qtquick1-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz";
-      sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877";
-      name = "qtquickcontrols-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb";
-      name = "qtimageformats-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz";
-      sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8";
-      name = "qtdoc-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz";
-      sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0";
-      name = "qtwayland-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80";
-      name = "qtmacextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz";
-      sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla";
-      name = "qtactiveqt-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz";
-      sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw";
-      name = "qtlocation-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs";
-      name = "qtconnectivity-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn";
-      name = "qtx11extras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz";
-      sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd";
-      name = "qttools-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz";
-      sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf";
-      name = "qtsensors-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz";
-      sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8";
-      name = "qtwebengine-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz";
-      sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz";
-      name = "qtsvg-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz";
-      sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44";
-      name = "qt5-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-      sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8";
-      name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx";
-      name = "qtandroidextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-]

pkgs/development/libraries/qt-5/5.4/manifest.sh

@@ -1,15 +1,9 @@
 #!/bin/sh
 
-if [ $# -eq 0 ]; then
+set -x
 
-  # The extra slash at the end of the URL is necessary to stop wget
+# The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
+# from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../../.. -A autonix.manifest) \
+$(nix-build ../../../../.. --no-out-link -A autonix.manifest) \
-    http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
+  http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
-      -A '*.tar.xz'
+    -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi

pkgs/development/libraries/qt-5/5.4/setup-hook.sh

@@ -24,12 +24,6 @@ addQtModule() {
             @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
             find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
         fi
-
-        propagatedBuildInputs+=" $1"
-    fi
-
-    if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
-        propagatedUserEnvPkgs+=" $1"
     fi
 }
 

pkgs/top-level/all-packages.nix

@@ -251,7 +251,7 @@ let
     theAttrSet = arg;
   };
 
-  autonix = callPackage ../build-support/autonix {};
+  autonix = import ../build-support/autonix { inherit pkgs; };
 
   autoreconfHook = makeSetupHook
     { substitutions = { inherit autoconf automake libtool gettext; }; }
@@ -11658,9 +11658,7 @@ let
     boost = boost155;
   };
 
-  kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
+  kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {});
-    kf5 = kf510;
-  });
   kdeApps_stable = kdeApps_15_04;
   kdeApps_latest = kdeApps_15_04;
 
@@ -13940,10 +13938,7 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
+  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { inherit pkgs newScope; });
-    kf5 = kf510;
-    kdeApps = kdeApps_15_04;
-  });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;