diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2018-09-10 18:00:14 -0300 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-10 23:00:14 +0200 |
commit | 2047e28c7fe94a8541f19ac2c57cf4866a318c57 (patch) | |
tree | 5a4d8bd21ef7194b566e62807bc51b6b2ff25241 | |
parent | f0839455e9637b4baeb34c245cfabb691a239481 (diff) | |
download | nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar.gz nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar.bz2 nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar.lz nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar.xz nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.tar.zst nixpkgs-2047e28c7fe94a8541f19ac2c57cf4866a318c57.zip |
lxqt: mv contents of base, core and optional to parent directory (#46484)
-rw-r--r-- | pkgs/desktops/lxqt/compton-conf/default.nix (renamed from pkgs/desktops/lxqt/optional/compton-conf/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/default.nix | 62 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/libfm-qt/default.nix (renamed from pkgs/desktops/lxqt/core/libfm-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/liblxqt/default.nix (renamed from pkgs/desktops/lxqt/base/liblxqt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/libqtxdg/default.nix (renamed from pkgs/desktops/lxqt/base/libqtxdg/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/libsysstat/default.nix (renamed from pkgs/desktops/lxqt/base/libsysstat/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lximage-qt/default.nix (renamed from pkgs/desktops/lxqt/optional/lximage-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-about/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-about/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-admin/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-admin/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-build-tools/default.nix (renamed from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-config/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-config/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-globalkeys/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-l10n/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-notificationd/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-panel/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-panel/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-policykit/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-powermanagement/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-qtplugin/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-runner/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-runner/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-session/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-session/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-sudo/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/lxqt-themes/default.nix (renamed from pkgs/desktops/lxqt/core/lxqt-themes/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/obconf-qt/default.nix (renamed from pkgs/desktops/lxqt/optional/obconf-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/pavucontrol-qt/default.nix (renamed from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/pcmanfm-qt/default.nix (renamed from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/qlipper/default.nix (renamed from pkgs/desktops/lxqt/optional/qlipper/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/qps/default.nix (renamed from pkgs/desktops/lxqt/optional/qps/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/qterminal/default.nix (renamed from pkgs/desktops/lxqt/optional/qterminal/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/qtermwidget/0.7.1.nix (renamed from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/qtermwidget/default.nix (renamed from pkgs/desktops/lxqt/core/qtermwidget/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/lxqt/screengrab/default.nix (renamed from pkgs/desktops/lxqt/optional/screengrab/default.nix) | 0 |
32 files changed, 31 insertions, 31 deletions
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 9c36b523207..9c36b523207 100644 --- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 015807ec684..62b8aaf25ab 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 index 4c187f1a07c..4c187f1a07c 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 0762dbad3f8..0762dbad3f8 100644 --- a/pkgs/desktops/lxqt/base/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 0b23fb2d04f..0b23fb2d04f 100644 --- a/pkgs/desktops/lxqt/base/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 2e6b79f9769..2e6b79f9769 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/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 index 7f80e56bc7d..7f80e56bc7d 100644 --- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix +++ b/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 index e109a4f0944..e109a4f0944 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/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 index a92c352087e..a92c352087e 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/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 index 46f904d0ec7..46f904d0ec7 100644 --- a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix +++ b/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 index 3a167996ddb..3a167996ddb 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/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 index 1877236bcdd..1877236bcdd 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/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 index 9a79ec16df0..9a79ec16df0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/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 index 32a3c408258..32a3c408258 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/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 index 56ea7ec7241..56ea7ec7241 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/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 index 8cdbf9f9365..8cdbf9f9365 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/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 index dcf46d09b73..dcf46d09b73 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/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 index 3b56a489bee..3b56a489bee 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/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 index 972d0a3cb37..972d0a3cb37 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/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 index c0ce6321f6e..c0ce6321f6e 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/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 index e369880b2b4..e369880b2b4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/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 index 4dddd7de09b..4dddd7de09b 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/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 index 1d2301d4a3b..1d2301d4a3b 100644 --- a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix +++ b/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 index 5ddb87ab55d..5ddb87ab55d 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/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 index efd5fde1666..efd5fde1666 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/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 index 99dace0e42e..99dace0e42e 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index e09c8bc09d5..e09c8bc09d5 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index a8ee18daf3c..a8ee18daf3c 100644 --- a/pkgs/desktops/lxqt/optional/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 3d5a25634d7..3d5a25634d7 100644 --- a/pkgs/desktops/lxqt/optional/qterminal/default.nix +++ b/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 index 93c93d2c6ba..93c93d2c6ba 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix +++ b/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 index eae53cefc58..eae53cefc58 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 8890d3f4780..8890d3f4780 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix |