From 2047e28c7fe94a8541f19ac2c57cf4866a318c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Sep 2018 18:00:14 -0300
Subject: [PATCH] lxqt: mv contents of base, core and optional to parent
 directory (#46484)

---
 .../{optional => }/compton-conf/default.nix   |  0
 pkgs/desktops/lxqt/default.nix                | 62 +++++++++----------
 .../lxqt/{core => }/libfm-qt/default.nix      |  0
 .../lxqt/{base => }/liblxqt/default.nix       |  0
 .../lxqt/{base => }/libqtxdg/default.nix      |  0
 .../lxqt/{base => }/libsysstat/default.nix    |  0
 .../{optional => }/lximage-qt/default.nix     |  0
 .../lxqt/{core => }/lxqt-about/default.nix    |  0
 .../lxqt/{core => }/lxqt-admin/default.nix    |  0
 .../{base => }/lxqt-build-tools/default.nix   |  0
 .../lxqt/{core => }/lxqt-config/default.nix   |  0
 .../{core => }/lxqt-globalkeys/default.nix    |  0
 .../lxqt/{core => }/lxqt-l10n/default.nix     |  0
 .../{core => }/lxqt-notificationd/default.nix |  0
 .../lxqt-openssh-askpass/default.nix          |  0
 .../lxqt/{core => }/lxqt-panel/default.nix    |  0
 .../{core => }/lxqt-policykit/default.nix     |  0
 .../lxqt-powermanagement/default.nix          |  0
 .../lxqt/{core => }/lxqt-qtplugin/default.nix |  0
 .../lxqt/{core => }/lxqt-runner/default.nix   |  0
 .../lxqt/{core => }/lxqt-session/default.nix  |  0
 .../lxqt/{core => }/lxqt-sudo/default.nix     |  0
 .../lxqt/{core => }/lxqt-themes/default.nix   |  0
 .../lxqt/{optional => }/obconf-qt/default.nix |  0
 .../{core => }/pavucontrol-qt/default.nix     |  0
 .../lxqt/{core => }/pcmanfm-qt/default.nix    |  0
 .../lxqt/{optional => }/qlipper/default.nix   |  0
 .../lxqt/{optional => }/qps/default.nix       |  0
 .../lxqt/{optional => }/qterminal/default.nix |  0
 .../lxqt/{core => }/qtermwidget/0.7.1.nix     |  0
 .../lxqt/{core => }/qtermwidget/default.nix   |  0
 .../{optional => }/screengrab/default.nix     |  0
 32 files changed, 31 insertions(+), 31 deletions(-)
 rename pkgs/desktops/lxqt/{optional => }/compton-conf/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/libfm-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/liblxqt/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/libqtxdg/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/libsysstat/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/lximage-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-about/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-admin/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/lxqt-build-tools/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-config/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-globalkeys/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-l10n/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-notificationd/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-openssh-askpass/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-panel/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-policykit/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-powermanagement/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-qtplugin/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-runner/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-session/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-sudo/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-themes/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/obconf-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/pavucontrol-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/pcmanfm-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qlipper/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qps/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qterminal/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/qtermwidget/0.7.1.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/qtermwidget/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/screengrab/default.nix (100%)

diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/compton-conf/default.nix
rename to pkgs/desktops/lxqt/compton-conf/default.nix
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 015807ec684e..62b8aaf25abe 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -7,44 +7,44 @@ let
     # - https://github.com/lxqt/lxqt/wiki/Building-from-source
 
     ### BASE
-    libqtxdg = callPackage ./base/libqtxdg { };
-    lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
-    libsysstat = callPackage ./base/libsysstat { };
-    liblxqt = callPackage ./base/liblxqt { };
+    libqtxdg = callPackage ./libqtxdg { };
+    lxqt-build-tools = callPackage ./lxqt-build-tools { };
+    libsysstat = callPackage ./libsysstat { };
+    liblxqt = callPackage ./liblxqt { };
 
     ### CORE 1
-    libfm-qt = callPackage ./core/libfm-qt { };
-    lxqt-about = callPackage ./core/lxqt-about { };
-    lxqt-admin = callPackage ./core/lxqt-admin { };
-    lxqt-config = callPackage ./core/lxqt-config { };
-    lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
-    lxqt-l10n = callPackage ./core/lxqt-l10n { };
-    lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
-    lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
-    lxqt-policykit = callPackage ./core/lxqt-policykit { };
-    lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
-    lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
-    lxqt-session = callPackage ./core/lxqt-session { };
-    lxqt-sudo = callPackage ./core/lxqt-sudo { };
-    lxqt-themes = callPackage ./core/lxqt-themes { };
-    pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
-    qtermwidget = callPackage ./core/qtermwidget { };
+    libfm-qt = callPackage ./libfm-qt { };
+    lxqt-about = callPackage ./lxqt-about { };
+    lxqt-admin = callPackage ./lxqt-admin { };
+    lxqt-config = callPackage ./lxqt-config { };
+    lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
+    lxqt-l10n = callPackage ./lxqt-l10n { };
+    lxqt-notificationd = callPackage ./lxqt-notificationd { };
+    lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
+    lxqt-policykit = callPackage ./lxqt-policykit { };
+    lxqt-powermanagement = callPackage ./lxqt-powermanagement { };
+    lxqt-qtplugin = callPackage ./lxqt-qtplugin { };
+    lxqt-session = callPackage ./lxqt-session { };
+    lxqt-sudo = callPackage ./lxqt-sudo { };
+    lxqt-themes = callPackage ./lxqt-themes { };
+    pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
+    qtermwidget = callPackage ./qtermwidget { };
     # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
-    qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
+    qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { };
 
     ### CORE 2
-    lxqt-panel = callPackage ./core/lxqt-panel { };
-    lxqt-runner = callPackage ./core/lxqt-runner { };
-    pcmanfm-qt = callPackage ./core/pcmanfm-qt { };
+    lxqt-panel = callPackage ./lxqt-panel { };
+    lxqt-runner = callPackage ./lxqt-runner { };
+    pcmanfm-qt = callPackage ./pcmanfm-qt { };
 
     ### OPTIONAL
-    qterminal = callPackage ./optional/qterminal { };
-    compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
-    obconf-qt = callPackage ./optional/obconf-qt { };
-    lximage-qt = callPackage ./optional/lximage-qt { };
-    qps = callPackage ./optional/qps { };
-    screengrab = callPackage ./optional/screengrab { };
-    qlipper = callPackage ./optional/qlipper { };
+    qterminal = callPackage ./qterminal { };
+    compton-conf = pkgs.qt5.callPackage ./compton-conf { };
+    obconf-qt = callPackage ./obconf-qt { };
+    lximage-qt = callPackage ./lximage-qt { };
+    qps = callPackage ./qps { };
+    screengrab = callPackage ./screengrab { };
+    qlipper = callPackage ./qlipper { };
 
     preRequisitePackages = [
       pkgs.gvfs # virtual file systems support for PCManFM-QT
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/libfm-qt/default.nix
rename to pkgs/desktops/lxqt/libfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/liblxqt/default.nix
rename to pkgs/desktops/lxqt/liblxqt/default.nix
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libqtxdg/default.nix
rename to pkgs/desktops/lxqt/libqtxdg/default.nix
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libsysstat/default.nix
rename to pkgs/desktops/lxqt/libsysstat/default.nix
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/lximage-qt/default.nix
rename to pkgs/desktops/lxqt/lximage-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-about/default.nix
rename to pkgs/desktops/lxqt/lxqt-about/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-admin/default.nix
rename to pkgs/desktops/lxqt/lxqt-admin/default.nix
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
rename to pkgs/desktops/lxqt/lxqt-build-tools/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-config/default.nix
rename to pkgs/desktops/lxqt/lxqt-config/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
rename to pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
rename to pkgs/desktops/lxqt/lxqt-l10n/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
rename to pkgs/desktops/lxqt/lxqt-notificationd/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
rename to pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-panel/default.nix
rename to pkgs/desktops/lxqt/lxqt-panel/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
rename to pkgs/desktops/lxqt/lxqt-policykit/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
rename to pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
rename to pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-runner/default.nix
rename to pkgs/desktops/lxqt/lxqt-runner/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-session/default.nix
rename to pkgs/desktops/lxqt/lxqt-session/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
rename to pkgs/desktops/lxqt/lxqt-sudo/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-themes/default.nix
rename to pkgs/desktops/lxqt/lxqt-themes/default.nix
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/obconf-qt/default.nix
rename to pkgs/desktops/lxqt/obconf-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
rename to pkgs/desktops/lxqt/pavucontrol-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
rename to pkgs/desktops/lxqt/pcmanfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qlipper/default.nix
rename to pkgs/desktops/lxqt/qlipper/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qps/default.nix
rename to pkgs/desktops/lxqt/qps/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qterminal/default.nix
rename to pkgs/desktops/lxqt/qterminal/default.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
rename to pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/default.nix
rename to pkgs/desktops/lxqt/qtermwidget/default.nix
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/screengrab/default.nix
rename to pkgs/desktops/lxqt/screengrab/default.nix