diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix index b973940b9b6..2d4faee5cf3 100644 --- a/pkgs/desktops/lxqt/base/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix @@ -3,17 +3,18 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac"; + sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; }; nativeBuildInputs = [ cmake + lxqt.lxqt-build-tools ]; buildInputs = [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { description = "Core utility library for all LXQt components"; homepage = https://github.com/lxde/liblxqt; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index 363b3d33d14..2776a53fa83 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n"; + sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; buildInputs = [ qt5.qtbase ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Library used to query system info and statistics"; homepage = https://github.com/lxde/libsysstat; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix new file mode 100644 index 00000000000..f8db33bc5a4 --- /dev/null +++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "lxqt-build-tools-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxqt-build-tools"; + rev = version; + sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; + }; + + nativeBuildInputs = [ cmake qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "Various packaging tools and scripts for LXQt applications"; + homepage = https://github.com/lxde/lxqt-build-tools; + license = licenses.lgpl21; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 71b6cff5899..4c7ecbc1804 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -4,29 +4,24 @@ libfm, menu-cache }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz"; + sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; }; nativeBuildInputs = [ cmake pkgconfig - lxqt.liblxqt - lxqt.libqtxdg + lxqt.lxqt-build-tools ]; buildInputs = [ qt5.qtx11extras qt5.qttools - qt5.qtsvg - kde5.kwindowsystem - xorg.libpthreadstubs - xorg.libXdmcp libfm menu-cache ]; @@ -37,7 +32,7 @@ stdenv.mkDerivation rec { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = https://github.com/lxde/libfm-qt; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix index 3e3b047dd4e..34491d0414b 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }: +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc"; + sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtx11extras @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = https://github.com/lxde/lxqt-about; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix index da47e02dcf1..2e6ae9858ad 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }: +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23"; + sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; }; nativeBuildInputs = [ cmake + lxqt.lxqt-build-tools ]; buildInputs = [ @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { description = "LXQt system administration tool"; homepage = https://github.com/lxde/lxqt-admin; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix index a4b8f000dc7..cc114c31dfd 100644 --- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-common"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b"; + sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ - qt5.qtx11extras - qt5.qttools qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg hicolor_icon_theme xmessage ]; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { description = "Common files for LXQt"; homepage = https://github.com/lxde/lxqt-common; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 66187a0ae6f..a16fcd21f68 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -3,19 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw"; + sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; }; nativeBuildInputs = [ cmake pkgconfig - ]; + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "Tools to configure LXQt and the underlying operating system"; homepage = https://github.com/lxde/lxqt-config; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 7f1f140653f..a23bff6e8d1 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y"; + sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { description = "Daemon used to register global keyboard shortcuts"; homepage = https://github.com/lxde/lxqt-globalkeys; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index 477575289bb..b836b9776e6 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk"; + sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; }; nativeBuildInputs = [ cmake - qt5.qtbase - qt5.qtx11extras qt5.qttools - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg + lxqt.lxqt-build-tools ]; postPatch = '' @@ -31,7 +26,7 @@ stdenv.mkDerivation rec { description = "Translations of LXQt"; homepage = https://github.com/lxde/lxqt-l10n; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index 1ecef633494..3646a461c83 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x"; + sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -21,6 +24,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; @@ -29,7 +33,7 @@ stdenv.mkDerivation rec { description = "The LXQt notification daemon"; homepage = https://github.com/lxde/lxqt-notificationd; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix index 202231fbdea..9190718fde4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c"; + sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { description = "GUI to query passwords on behalf of SSH agents"; homepage = https://github.com/lxde/lxqt-openssh-askpass; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d5786444fad..0c899c67dad 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -5,16 +5,20 @@ lxmenu-data }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq"; + sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -27,6 +31,7 @@ stdenv.mkDerivation rec { kde5.kguiaddons lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common lxqt.lxqt-globalkeys lxqt.libsysstat xorg.libpthreadstubs @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { description = "The LXQt desktop panel"; homepage = https://github.com/lxde/lxqt-panel; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix index 627f43f8be6..f4351a9598d 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd"; + sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -31,7 +35,7 @@ stdenv.mkDerivation rec { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxde/lxqt-policykit; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix index aabce857edd..b7321c64668 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa"; + sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { description = "Power management module for LXQt"; homepage = https://github.com/lxde/lxqt-powermanagement; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix index e0a95d23c4e..49fa7c61633 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx"; + sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -20,8 +23,6 @@ stdenv.mkDerivation rec { qt5.qttools qt5.qtsvg qt5.libdbusmenu - kde5.kwindowsystem - lxqt.liblxqt lxqt.libqtxdg ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { description = "LXQt Qt platform integration plugin"; homepage = https://github.com/lxde/lxqt-qtplugin; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 02d6f90397a..f420e9e410a 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -4,16 +4,20 @@ menu-cache, muparser }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc"; + sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -22,6 +26,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common lxqt.lxqt-globalkeys menu-cache muparser @@ -33,7 +38,7 @@ stdenv.mkDerivation rec { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxde/lxqt-runner; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index a226169b21a..1dfdd303a72 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4"; + sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -21,6 +25,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxde/lxqt-session; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix index ad0885917ae..83b16587523 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j"; + sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { description = "GUI frontend for sudo/su"; homepage = https://github.com/lxde/lxqt-sudo; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index ea2f24d6cf1..b8421d06202 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,29 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, -xdg-user-dirs, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.1.0"; + version = "0.2.0"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j"; + sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg - xdg-user-dirs libpulseaudio ]; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = https://github.com/lxde/pavucontrol-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix index bc9cf774017..7c115c2ca27 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -1,31 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm, -menu-cache, lxmenu-data }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libfm, menu-cache, lxmenu-data }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.11.1"; + version = "0.11.3"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32"; + sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.libfm-qt - xorg.libpthreadstubs - xorg.libXdmcp libfm menu-cache lxmenu-data @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxde/pcmanfm-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index 33f3cc19cf6..66620e195ec 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.7.0"; + version = "0.7.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz"; + sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A terminal emulator widget for Qt 5"; homepage = https://github.com/lxde/qtermwidget; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index d5f5194c48e..3cd8fdf2212 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -28,6 +28,7 @@ let ### BASE libqtxdg = callPackage ./base/libqtxdg { }; + lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; libsysstat = callPackage ./base/libsysstat { }; liblxqt = callPackage ./base/liblxqt { }; diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix index 45717fe31e2..c25ee10bd25 100644 --- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix @@ -3,25 +3,24 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "compton-conf"; - version = "0.2.0"; + version = "0.2.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk"; + sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools - qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg libconfig ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "GUI configuration tool for compton X composite manager"; homepage = https://github.com/lxde/compton-conf; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix index ac7055924c4..3308f0e412b 100644 --- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix @@ -1,33 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, - libfm, menu-cache, libexif }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, libfm, libexif }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lximage-qt"; - version = "0.5.0"; + version = "0.5.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0c5s0c2y73hp7mcxwg31bpn0kmjyhv519d0dxzp3na56n0xk9vl0"; + sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.libfm-qt xorg.libpthreadstubs xorg.libXdmcp libfm - menu-cache libexif ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "The image viewer and screenshot tool for lxqt"; homepage = https://github.com/lxde/lximage-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index 381c998616f..36490b726e0 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, -openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk"; + sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg xorg.libpthreadstubs xorg.libXdmcp + xorg.libSM openbox hicolor_icon_theme ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = https://github.com/lxde/obconf-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 551259ac3a0..376b8fb0190 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qlipper"; - version = "2016-09-26"; + version = "5.0.0"; srcs = fetchFromGitHub { owner = "pvanek"; repo = pname; - rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486"; - sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k"; + rev = version; + sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j"; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Cross-platform clipboard history applet"; homepage = https://github.com/pvanek/qlipper; license = licenses.gpl2Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix index 7f0f66c6fbe..ff59a2d893c 100644 --- a/pkgs/desktops/lxqt/optional/qterminal/default.nix +++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qterminal"; - version = "0.7.0"; + version = "0.7.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v"; + sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.qtermwidget ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "A lightweight Qt-based terminal emulator"; homepage = https://github.com/lxde/qterminal; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 2ef1c7532a5..b3524d36777 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }: stdenv.mkDerivation rec { - name = "screengrab-unstable-2016-09-12"; + name = "screengrab-unstable-2017-02-18"; srcs = fetchFromGitHub { owner = "QtDesktop"; repo = "screengrab"; - rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6"; - sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5"; + rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64"; + sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0"; }; nativeBuildInputs = [ cmake pkgconfig ];