From 9278b39e9012cb85ea41e578697caa873282d0bb Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 1 Aug 2023 17:49:39 +0800 Subject: [PATCH 1/2] deepin-terminal: enable nixosTests.terminal-emulators --- nixos/tests/terminal-emulators.nix | 2 ++ pkgs/desktops/deepin/apps/deepin-terminal/default.nix | 3 +++ 2 files changed, 5 insertions(+) diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 1651fd54400f..b97394194a22 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -35,6 +35,8 @@ let tests = { darktile.pkg = p: p.darktile; + deepin-terminal.pkg = p: p.deepin.deepin-terminal; + eterm.pkg = p: p.eterm; eterm.executable = "Eterm"; eterm.pinkValue = "#D40055"; diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 9f27dbaab9e8..da6d12cd6ac4 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -17,6 +17,7 @@ , libsecret , chrpath , lxqt +, nixosTests }: stdenv.mkDerivation rec { @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal; + meta = with lib; { description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; homepage = "https://github.com/linuxdeepin/deepin-terminal"; From 6fbb653d0e1382a87f24b883a5322db201d21c7e Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 1 Aug 2023 17:52:35 +0800 Subject: [PATCH 2/2] nixosTests.terminal-emulators: deprecated `machine' attribute by `nodes.machine' --- nixos/tests/terminal-emulators.nix | 2 +- pkgs/desktops/deepin/apps/deepin-terminal/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index b97394194a22..6d76cc8e5741 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -123,7 +123,7 @@ in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable} maintainers = [ jjjollyjim ]; }; - machine = { pkgsInner, ... }: + nodes.machine = { pkgsInner, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index da6d12cd6ac4..5caa37bfeadd 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , fetchpatch +, nixosTests , dtkwidget , qt5integration , qt5platform-plugins @@ -17,7 +18,6 @@ , libsecret , chrpath , lxqt -, nixosTests }: stdenv.mkDerivation rec {