JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #72979 from worldofpeace/more-gnome-installed-test-cleanup

Browse Source 
More gnome installed test cleanup
This commit is contained in:
worldofpeace 2019-11-07 14:34:28 +00:00 committed by GitHub
commit 65b2a768bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -94,7 +94,6 @@ in
gitea = handleTest ./gitea.nix {};
gitlab = handleTest ./gitlab.nix {};
gitolite = handleTest ./gitolite.nix {};
gjs = handleTest ./gjs.nix {};
glusterfs = handleTest ./glusterfs.nix {};
gnome3-xorg = handleTest ./gnome3-xorg.nix {};
gnome3 = handleTest ./gnome3.nix {};
@ -142,7 +141,6 @@ in
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
ldap = handleTest ./ldap.nix {};
leaps = handleTest ./leaps.nix {};
libgdata = handleTest ./libgdata.nix {};
lidarr = handleTest ./lidarr.nix {};
lightdm = handleTest ./lightdm.nix {};
limesurvey = handleTest ./limesurvey.nix {};

1
nixos/tests/installed-tests/default.nix
View File

@ -73,6 +73,7 @@ in
glib-networking = callInstalledTest ./glib-networking.nix {};
gnome-photos = callInstalledTest ./gnome-photos.nix {};
graphene = callInstalledTest ./graphene.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
libxmlb = callInstalledTest ./libxmlb.nix {};
ostree = callInstalledTest ./ostree.nix {};
xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};

11
nixos/tests/installed-tests/libgdata.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.libgdata;
testConfig = {
# # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
# Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
services.gnome3.glib-networking.enable = true;
};
}

21
nixos/tests/libgdata.nix
View File

@ -1,21 +0,0 @@
# run installed tests
import ./make-test.nix ({ pkgs, ... }:
{
name = "libgdata";
meta = {
maintainers = pkgs.libgdata.meta.maintainers;
};
machine = { pkgs, ... }: {
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
# # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
# Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
services.gnome3.glib-networking.enable = true;
};
testScript = ''
$machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libgdata.installedTests}/share'");
'';
})

8
pkgs/development/libraries/flatpak/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
stdenv.mkDerivation rec {
@ -76,6 +76,12 @@ stdenv.mkDerivation rec {
patchShebangs tests
'';
passthru = {
tests = {
installedTests = nixosTests.installed-tests.flatpak;
};
};
meta = with stdenv.lib; {
description = "Linux application sandboxing and distribution framework";
homepage = https://flatpak.org/;

6
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
@ -85,6 +85,10 @@ in stdenv.mkDerivation rec {
packageName = pname;
};
tests = {
installedTests = nixosTests.installed-tests.gdk-pixbuf;
};
# gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
};

2
pkgs/development/libraries/glib-networking/default.nix
View File

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
};
tests = {
installedTests = nixosTests.glib-networking;
installedTests = nixosTests.installed-tests.glib-networking;
};
};

2
pkgs/development/libraries/graphene/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
installedTests = nixosTests.graphene;
installedTests = nixosTests.installed-tests.graphene;
};
};

2
pkgs/development/libraries/libgdata/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
};
tests = {
installedTests = nixosTests.libgdata;
installedTests = nixosTests.installed-tests.libgdata;
};
};

2
pkgs/development/libraries/libxmlb/default.nix
View File

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
installed-tests = nixosTests.libxmlb;
installed-tests = nixosTests.installed-tests.libxmlb;
};
};

8
pkgs/development/libraries/xdg-desktop-portal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }:
{ stdenv, fetchFromGitHub, nixosTests, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal";
@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
"installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal"
];
passthru = {
tests = {
installedTests = nixosTests.installed-tests.xdg-desktop-portal;
};
};
meta = with stdenv.lib; {
description = "Desktop integration portals for sandboxed apps";
license = licenses.lgpl21;

12
pkgs/development/tools/flatpak-builder/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, fetchurl
, substituteAll
, nixosTests
, autoreconfHook
, docbook_xml_dtd_412
@ -131,7 +132,16 @@ in stdenv.mkDerivation rec {
'';
passthru = {
installedTestsDependencies = [ gnupg ostree python2 gnumake ];
installedTestsDependencies = [
gnupg
ostree
python2
gnumake
];
tests = {
installedTests = nixosTests.installed-tests.flatpak-builder;
};
};
meta = with stdenv.lib; {

2
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -262,7 +262,7 @@ stdenv.mkDerivation rec {
];
tests = {
installedTests = nixosTests.fwupd;
installedTests = nixosTests.installed-tests.fwupd;
};
};

7
pkgs/tools/misc/colord/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, nixosTests
, bash-completion
, glib
, polkit
@ -97,6 +98,12 @@ stdenv.mkDerivation rec {
PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
passthru = {
tests = {
installedTests = nixosTests.installed-tests.colord;
};
};
meta = with stdenv.lib; {
description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
homepage = https://www.freedesktop.org/software/colord/;

8
pkgs/tools/misc/ostree/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gjs
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gjs, nixosTests
, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
}:
@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
];
passthru = {
tests = {
installedTests = nixosTests.installed-tests.ostree;
};
};
meta = with stdenv.lib; {
description = "Git for operating system binaries";
homepage = https://ostree.readthedocs.io/en/latest/;