Merge pull request #171071 from jtojnar/fdo-updates
Update some low-key fdo packages
This commit is contained in:
commit
a1439bc965
@ -106,6 +106,5 @@ in
|
|||||||
malcontent = callInstalledTest ./malcontent.nix {};
|
malcontent = callInstalledTest ./malcontent.nix {};
|
||||||
ostree = callInstalledTest ./ostree.nix {};
|
ostree = callInstalledTest ./ostree.nix {};
|
||||||
pipewire = callInstalledTest ./pipewire.nix {};
|
pipewire = callInstalledTest ./pipewire.nix {};
|
||||||
power-profiles-daemon = callInstalledTest ./power-profiles-daemon.nix {};
|
|
||||||
xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};
|
xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};
|
||||||
}
|
}
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
{ pkgs, lib, makeInstalledTest, ... }:
|
|
||||||
|
|
||||||
makeInstalledTest {
|
|
||||||
tested = pkgs.power-profiles-daemon;
|
|
||||||
|
|
||||||
testConfig = {
|
|
||||||
services.power-profiles-daemon.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
@ -19,15 +19,21 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "umockdev";
|
pname = "umockdev";
|
||||||
version = "0.17.8";
|
version = "0.17.9";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
|
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-s3zeWJxw5ohUtsv4NZGKcdP8khEYzIXycbBrAzdnVoU=";
|
sha256 = "sha256-FEmWjJVmKKckC30zULGI/mZ3VNtirnweZq2gKh/Y5VE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Hardcode absolute paths to libraries so that consumers
|
||||||
|
# do not need to set LD_LIBRARY_PATH themselves.
|
||||||
|
./hardcode-paths.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
docbook-xsl-nons
|
docbook-xsl-nons
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
@ -57,6 +63,21 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Substitute the path to this derivation in the patch we apply.
|
||||||
|
substituteInPlace src/umockdev-wrapper \
|
||||||
|
--subst-var-by 'LIBDIR' "''${!outputLib}/lib"
|
||||||
|
'';
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
# Our patch makes the path to the `LD_PRELOAD`ed library absolute.
|
||||||
|
# When running tests, the library is not yet installed, though,
|
||||||
|
# so we need to replace the absolute path with a local one during build.
|
||||||
|
# We are using a symlink that will be overridden during installation.
|
||||||
|
mkdir -p "$out/lib"
|
||||||
|
ln -s "$PWD/libumockdev-preload.so.0" "$out/lib/libumockdev-preload.so.0"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Mock hardware devices for creating unit tests";
|
description = "Mock hardware devices for creating unit tests";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
|
69
pkgs/development/libraries/umockdev/hardcode-paths.patch
Normal file
69
pkgs/development/libraries/umockdev/hardcode-paths.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 2ed9027..1f6bbf2 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -38,6 +38,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false)
|
||||||
|
|
||||||
|
conf.set('PACKAGE_NAME', meson.project_name())
|
||||||
|
conf.set_quoted('VERSION', meson.project_version())
|
||||||
|
+conf.set_quoted('LIBDIR', get_option('prefix') / get_option('libdir'))
|
||||||
|
|
||||||
|
# glibc versions somewhere between 2.28 and 2.34
|
||||||
|
if cc.has_function('__fxstatat', prefix: '#include <sys/stat.h>')
|
||||||
|
@@ -148,7 +149,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir',
|
||||||
|
|
||||||
|
if g_ir_compiler.found()
|
||||||
|
umockdev_typelib = custom_target('UMockdev-1.0 typelib',
|
||||||
|
- command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', 'libumockdev.so.0', '@INPUT@'],
|
||||||
|
+ command: [g_ir_compiler, '--output', '@OUTPUT@', '-l', get_option('prefix') / get_option('libdir') / 'libumockdev.so.0', '@INPUT@'],
|
||||||
|
input: hacked_gir,
|
||||||
|
output: 'UMockdev-1.0.typelib',
|
||||||
|
install: true,
|
||||||
|
diff --git a/src/config.vapi b/src/config.vapi
|
||||||
|
index 5269dd0..a2ec46d 100644
|
||||||
|
--- a/src/config.vapi
|
||||||
|
+++ b/src/config.vapi
|
||||||
|
@@ -2,5 +2,6 @@
|
||||||
|
namespace Config {
|
||||||
|
public const string PACKAGE_NAME;
|
||||||
|
public const string VERSION;
|
||||||
|
+ public const string LIBDIR;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala
|
||||||
|
index 8434d32..68c7f8e 100644
|
||||||
|
--- a/src/umockdev-record.vala
|
||||||
|
+++ b/src/umockdev-record.vala
|
||||||
|
@@ -435,7 +435,7 @@ main (string[] args)
|
||||||
|
preload = "";
|
||||||
|
else
|
||||||
|
preload = preload + ":";
|
||||||
|
- Environment.set_variable("LD_PRELOAD", preload + "libumockdev-preload.so.0", true);
|
||||||
|
+ Environment.set_variable("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
root_dir = DirUtils.make_tmp("umockdev.XXXXXX");
|
||||||
|
diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala
|
||||||
|
index 9a1ba10..6df2522 100644
|
||||||
|
--- a/src/umockdev-run.vala
|
||||||
|
+++ b/src/umockdev-run.vala
|
||||||
|
@@ -95,7 +95,7 @@ main (string[] args)
|
||||||
|
preload = "";
|
||||||
|
else
|
||||||
|
preload = preload + ":";
|
||||||
|
- Environment.set_variable ("LD_PRELOAD", preload + "libumockdev-preload.so.0", true);
|
||||||
|
+ Environment.set_variable ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true);
|
||||||
|
|
||||||
|
var testbed = new UMockdev.Testbed ();
|
||||||
|
|
||||||
|
diff --git a/src/umockdev-wrapper b/src/umockdev-wrapper
|
||||||
|
index 6ce4dcd..706c49a 100755
|
||||||
|
--- a/src/umockdev-wrapper
|
||||||
|
+++ b/src/umockdev-wrapper
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# Wrapper program to preload the libumockdev library, so that test programs can
|
||||||
|
# set $UMOCKDEV_DIR for redirecting sysfs and other queries to a test bed.
|
||||||
|
-exec env LD_PRELOAD=libumockdev-preload.so.0:$LD_PRELOAD "$@"
|
||||||
|
+exec env LD_PRELOAD=@LIBDIR@/libumockdev-preload.so.0:$LD_PRELOAD "$@"
|
||||||
|
|
@ -13,7 +13,7 @@
|
|||||||
, libxml2
|
, libxml2
|
||||||
, libxslt
|
, libxslt
|
||||||
, docbook_xml_dtd_45
|
, docbook_xml_dtd_45
|
||||||
, docbook_xsl
|
, docbook-xsl-nons
|
||||||
, glib
|
, glib
|
||||||
, systemd
|
, systemd
|
||||||
, polkit
|
, polkit
|
||||||
@ -21,39 +21,33 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bolt";
|
pname = "bolt";
|
||||||
version = "0.9.1";
|
version = "0.9.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "bolt";
|
owner = "bolt";
|
||||||
repo = "bolt";
|
repo = "bolt";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm";
|
sha256 = "eXjj7oD5HOW/AG2uxDa0tSleKmbouFd2fwlL2HHFiMA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# meson install tries to create /var/lib/boltd
|
# meson install tries to create /var/lib/boltd
|
||||||
./0001-skip-mkdir.patch
|
./0001-skip-mkdir.patch
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/104429
|
# Test does not work on ZFS with atime disabled.
|
||||||
# Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
|
# Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "disable-atime-tests.diff";
|
url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/c2f1d5c40ad71b20507e02faa11037b395fac2f8.diff";
|
||||||
url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff";
|
revert = true;
|
||||||
sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8";
|
sha256 = "6w7ll65W/CydrWAVi/qgzhrQeDv1PWWShulLxoglF+I=";
|
||||||
})
|
|
||||||
|
|
||||||
# Fix tests with newer umockdev
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch";
|
|
||||||
sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk=";
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
asciidoc
|
asciidoc
|
||||||
docbook_xml_dtd_45
|
docbook_xml_dtd_45
|
||||||
docbook_xsl
|
docbook-xsl-nons
|
||||||
libxml2
|
libxml2
|
||||||
libxslt
|
libxslt
|
||||||
meson
|
meson
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
, libgudev
|
, libgudev
|
||||||
, glib
|
, glib
|
||||||
, polkit
|
, polkit
|
||||||
|
, dbus
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gettext
|
, gettext
|
||||||
, gtk-doc
|
, gtk-doc
|
||||||
@ -29,34 +30,21 @@ let
|
|||||||
dbus-python
|
dbus-python
|
||||||
python-dbusmock
|
python-dbusmock
|
||||||
];
|
];
|
||||||
testTypelibPath = lib.makeSearchPathOutput "lib" "lib/girepository-1.0" [ umockdev ];
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "power-profiles-daemon";
|
pname = "power-profiles-daemon";
|
||||||
version = "0.10.1";
|
version = "0.11.1";
|
||||||
|
|
||||||
outputs = [ "out" "devdoc" "installedTests" ];
|
outputs = [ "out" "devdoc" ];
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "hadess";
|
owner = "hadess";
|
||||||
repo = "power-profiles-daemon";
|
repo = "power-profiles-daemon";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-sQWiCHc0kEELdmPq9Qdk7OKDUgbM5R44639feC7gjJc=";
|
sha256 = "sha256-qU9A9U2R3UioC7bo8Pc0IIsHIjghb6gsG4pTAg6tp9E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Enable installed tests.
|
|
||||||
# https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/merge_requests/92
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/commit/3c64d9e1732eb6425e33013c452f1c4aa7a26f7e.patch";
|
|
||||||
sha256 = "din5VuZZwARNDInHtl44yJK8pLmlxr5eoD4iMT4a8HA=";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Install installed tests to separate output.
|
|
||||||
./installed-tests-path.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
meson
|
meson
|
||||||
@ -70,9 +58,6 @@ stdenv.mkDerivation rec {
|
|||||||
gobject-introspection
|
gobject-introspection
|
||||||
wrapGAppsNoGuiHook
|
wrapGAppsNoGuiHook
|
||||||
python3.pkgs.wrapPython
|
python3.pkgs.wrapPython
|
||||||
|
|
||||||
# For finding tests.
|
|
||||||
(python3.withPackages testPythonPkgs)
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -91,31 +76,28 @@ stdenv.mkDerivation rec {
|
|||||||
python3.pkgs.pygobject3
|
python3.pkgs.pygobject3
|
||||||
];
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
umockdev
|
||||||
|
dbus
|
||||||
|
(python3.withPackages testPythonPkgs)
|
||||||
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
|
||||||
"-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
"-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||||
"-Dgtk_doc=true"
|
"-Dgtk_doc=true"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
|
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
|
||||||
|
|
||||||
# Avoid double wrapping
|
# Avoid double wrapping
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs tests/unittest_inspector.py
|
patchShebangs --build \
|
||||||
'';
|
tests/integration-test.py \
|
||||||
|
tests/unittest_inspector.py
|
||||||
preConfigure = ''
|
|
||||||
# For finding tests.
|
|
||||||
GI_TYPELIB_PATH_original=$GI_TYPELIB_PATH
|
|
||||||
addToSearchPath GI_TYPELIB_PATH "${testTypelibPath}"
|
|
||||||
'';
|
|
||||||
|
|
||||||
postConfigure = ''
|
|
||||||
# Restore the original value to prevent the program from depending on umockdev.
|
|
||||||
export GI_TYPELIB_PATH=$GI_TYPELIB_PATH_original
|
|
||||||
unset GI_TYPELIB_PATH_original
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
@ -128,33 +110,22 @@ stdenv.mkDerivation rec {
|
|||||||
export PKEXEC_UID=-1
|
export PKEXEC_UID=-1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postCheck = ''
|
||||||
|
# Do not contaminate the wrapper with test dependencies.
|
||||||
|
unset GI_TYPELIB_PATH
|
||||||
|
unset XDG_DATA_DIRS
|
||||||
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
# Avoid double wrapping
|
# Avoid double wrapping
|
||||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
# Make Python libraries available
|
# Make Python libraries available
|
||||||
wrapPythonProgramsIn "$out/bin" "$pythonPath"
|
wrapPythonProgramsIn "$out/bin" "$pythonPath"
|
||||||
|
|
||||||
# Make Python libraries available for installed tests
|
|
||||||
makeWrapperArgs+=(
|
|
||||||
--prefix GI_TYPELIB_PATH : "${testTypelibPath}"
|
|
||||||
--prefix PATH : "${lib.makeBinPath [ umockdev ]}"
|
|
||||||
# Vala does not use absolute paths in typelibs
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/47226
|
|
||||||
# Also umockdev binaries use relative paths for LD_PRELOAD.
|
|
||||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ umockdev ]}"
|
|
||||||
# dbusmock calls its templates using exec so our regular patching of Python scripts
|
|
||||||
# to add package directories to site will not carry over.
|
|
||||||
# https://github.com/martinpitt/python-dbusmock/blob/2254e69279a02fb3027b500ed7288b77c7a80f2a/dbusmock/mockobject.py#L51
|
|
||||||
# https://github.com/martinpitt/python-dbusmock/blob/2254e69279a02fb3027b500ed7288b77c7a80f2a/dbusmock/__main__.py#L60-L62
|
|
||||||
--prefix PYTHONPATH : "${lib.makeSearchPath python3.sitePackages (testPythonPkgs python3.pkgs)}"
|
|
||||||
)
|
|
||||||
wrapPythonProgramsIn "$installedTests/libexec/installed-tests" "$pythonPath ${lib.concatStringsSep " " (testPythonPkgs python3.pkgs)}"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
tests = {
|
tests = {
|
||||||
nixos = nixosTests.power-profiles-daemon;
|
nixos = nixosTests.power-profiles-daemon;
|
||||||
installed-tests = nixosTests.installed-tests.power-profiles-daemon;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,37 +0,0 @@
|
|||||||
diff --git a/meson_options.txt b/meson_options.txt
|
|
||||||
index 7e89619..76497db 100644
|
|
||||||
--- a/meson_options.txt
|
|
||||||
+++ b/meson_options.txt
|
|
||||||
@@ -1,3 +1,4 @@
|
|
||||||
+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
|
|
||||||
option('systemdsystemunitdir',
|
|
||||||
description: 'systemd unit directory',
|
|
||||||
type: 'string',
|
|
||||||
diff --git a/tests/meson.build b/tests/meson.build
|
|
||||||
index b306a7f..7670e1b 100644
|
|
||||||
--- a/tests/meson.build
|
|
||||||
+++ b/tests/meson.build
|
|
||||||
@@ -2,8 +2,8 @@ envs = environment()
|
|
||||||
envs.set ('top_builddir', meson.build_root())
|
|
||||||
envs.set ('top_srcdir', meson.source_root())
|
|
||||||
|
|
||||||
-installed_test_bindir = libexecdir / 'installed-tests' / meson.project_name()
|
|
||||||
-installed_test_datadir = datadir / 'installed-tests' / meson.project_name()
|
|
||||||
+installed_test_bindir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name()
|
|
||||||
+installed_test_datadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
|
|
||||||
|
|
||||||
python3 = find_program('python3')
|
|
||||||
unittest_inspector = find_program('unittest_inspector.py')
|
|
||||||
diff --git a/tests/integration-test.py b/tests/integration-test.py
|
|
||||||
index 22dc42c..0f92b76 100755
|
|
||||||
--- a/tests/integration-test.py
|
|
||||||
+++ b/tests/integration-test.py
|
|
||||||
@@ -67,7 +67,7 @@ class Tests(dbusmock.DBusTestCase):
|
|
||||||
print('Testing binaries from JHBuild (%s)' % cls.daemon_path)
|
|
||||||
else:
|
|
||||||
cls.daemon_path = None
|
|
||||||
- with open('/usr/lib/systemd/system/power-profiles-daemon.service') as f:
|
|
||||||
+ with open('/run/current-system/sw/lib/systemd/system/power-profiles-daemon.service') as f:
|
|
||||||
for line in f:
|
|
||||||
if line.startswith('ExecStart='):
|
|
||||||
cls.daemon_path = line.split('=', 1)[1].strip()
|
|
Loading…
Reference in New Issue
Block a user