From c942cd7b2eac6e2851b7b603f46e1347bf681e10 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Feb 2022 19:26:15 +0800 Subject: nixosTests.installed-tests.appstream: init --- nixos/tests/installed-tests/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/tests/installed-tests/default.nix') diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 08785e5e666..e6e1386a373 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -84,6 +84,7 @@ let in { + appstream = callInstalledTest ./appstream.nix {}; colord = callInstalledTest ./colord.nix {}; flatpak = callInstalledTest ./flatpak.nix {}; flatpak-builder = callInstalledTest ./flatpak-builder.nix {}; -- cgit 1.4.1 From b3d4c1d48f4bb8ac17ff5252707f960c0a06a07f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Feb 2022 20:09:27 +0800 Subject: nixosTests.installed-tests.appstream-qt: init --- nixos/tests/installed-tests/appstream-qt.nix | 9 +++++++++ nixos/tests/installed-tests/default.nix | 1 + pkgs/development/libraries/appstream/qt.nix | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/installed-tests/appstream-qt.nix (limited to 'nixos/tests/installed-tests/default.nix') diff --git a/nixos/tests/installed-tests/appstream-qt.nix b/nixos/tests/installed-tests/appstream-qt.nix new file mode 100644 index 00000000000..d08187bfe46 --- /dev/null +++ b/nixos/tests/installed-tests/appstream-qt.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.libsForQt5.appstream-qt; + + testConfig = { + appstream.enable = true; + }; +} diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index e6e1386a373..079fd54e71e 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -85,6 +85,7 @@ in { appstream = callInstalledTest ./appstream.nix {}; + appstream-qt = callInstalledTest ./appstream-qt.nix {}; colord = callInstalledTest ./colord.nix {}; flatpak = callInstalledTest ./flatpak.nix {}; flatpak-builder = callInstalledTest ./flatpak-builder.nix {}; diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 0bcb4741ff1..6a673a0a264 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, appstream, qtbase, qttools }: +{ mkDerivation, appstream, qtbase, qttools, nixosTests }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here @@ -6,7 +6,7 @@ mkDerivation { pname = "appstream-qt"; inherit (appstream) version src patches; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; @@ -19,6 +19,12 @@ mkDerivation { -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" ''; + passthru = appstream.passthru // { + tests = { + installed-tests = nixosTests.installed-tests.appstream-qt; + }; + }; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; -- cgit 1.4.1