From 86056190ef3e154f0fec89c2d0b456facdde322c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 28 Jun 2024 09:33:47 -0300 Subject: [PATCH 1/3] lxqt.qtermwidget: 2.0.0 -> 2.0.1 Diff: https://github.com/lxqt/qtermwidget/compare/2.0.0...2.0.1 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 12640bb740d5..51b9cef886ae 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.0.1" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.0.0" = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE="; + "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78="; }."${version}"; }; From 3c9fdab54062d06fc6040ce22306687e257b6ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 28 Jun 2024 09:26:14 -0300 Subject: [PATCH 2/3] lxqt.qterminal: 2.0.0 -> 2.0.1 Diff: https://github.com/lxqt/qterminal/compare/2.0.0...2.0.1 --- pkgs/desktops/lxqt/qterminal/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 3505897fcfd0..0155fdf5322a 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, layer-shell-qt , lxqt-build-tools , qtbase , qtermwidget @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-SesKJCiMoiqkvMM29+0IMERozQ9zuD+NJTtaC6j7ubM="; + hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + layer-shell-qt qtbase qtermwidget qtwayland From c148010f3638dcc8d4caacfb655e37cb5557c3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 29 Jun 2024 11:52:55 -0300 Subject: [PATCH 3/3] CuboCore.coreterminal: fix dependency on qt5 version of qtermwidget --- pkgs/top-level/cubocore-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix index 3c6ed65e9286..e7cae57831fd 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -74,7 +74,7 @@ let }; coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { - inherit (lxqt) qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; inherit libcprime libcsys; };