kde5: move files around to simplify merge

It is analogous to 98d8e1a160.
2016-03-08 08:31:34 +01:00 · 2016-03-08 08:31:34 +01:00 · f306e67e15
commit f306e67e15
parent 4e2fe6e579
177 changed files with 11 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,7 +12,5 @@ result-*
 .DS_Store
 /pkgs/applications/kde-apps-*/tmp/
 /pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
+/pkgs/desktops/kde-5/*/tmp/
--- a/pkgs/desktops/kde-5/applications-15.12/ark.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/ark.nix
--- a/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
--- a/pkgs/desktops/kde-5/applications-15.12/default.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/default.nix
--- a/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
--- a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
--- a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
--- a/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
--- a/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
--- a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kate.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kate.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
--- a/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
--- a/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
--- a/pkgs/desktops/kde-5/applications-15.12/konsole.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
--- a/pkgs/desktops/kde-5/applications-15.12/l10n.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
--- a/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
--- a/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
--- a/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
--- a/pkgs/desktops/kde-5/applications-15.12/okular.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/okular.nix
--- a/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
--- a/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
--- a/pkgs/desktops/kde-5/applications-15.12/srcs.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
--- a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
--- a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/series
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
--- a/Show More
+++ b/Show More