power-profiles-daemon: 0.13 -> 0.20

The upstream original maintainer is not paid anymore to maintain the
project and decided to step down. The project has been taken over by
the upower team.

This is the first release part of this upower team.

The integration tests are now relying on the powerprofilectl command:
we need to patch the python path of this dependency before running the
integration tests instead of doing that during in the fixup phase.

Taking advantage of this to remove the PostFixup phase. Not 100% about
this move: it's a bit less future proof.
This commit is contained in:
Félix Baylac Jacqué 2024-02-18 13:43:46 +01:00
parent 6ecec40792
commit 93679d4d0a

View File

@ -5,7 +5,6 @@
, mesonEmulatorHook
, ninja
, fetchFromGitLab
, fetchpatch
, libgudev
, glib
, polkit
@ -21,22 +20,21 @@
, umockdev
, systemd
, python3
, wrapGAppsNoGuiHook
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "power-profiles-daemon";
version = "0.13";
version = "0.20";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "hadess";
owner = "upower";
repo = "power-profiles-daemon";
rev = version;
sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE=";
sha256 = "sha256-8wSRPR/1ELcsZ9K3LvSNlPcJvxRhb/LRjTIxKtdQlCA=";
};
nativeBuildInputs = [
@ -50,8 +48,6 @@ stdenv.mkDerivation rec {
libxml2 # for xmllint for stripping GResources
libxslt # for xsltproc for building docs
gobject-introspection
wrapGAppsNoGuiHook
python3.pkgs.wrapPython
# checkInput but cheked for during the configuring
(python3.pythonOnBuildForHost.withPackages (ps: with ps; [
pygobject3
@ -68,16 +64,16 @@ stdenv.mkDerivation rec {
upower
glib
polkit
python3 # for cli tool
# Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved
umockdev
# for cli tool
(python3.withPackages (ps: [
ps.pygobject3
]))
];
strictDeps = true;
# for cli tool
pythonPath = [
python3.pkgs.pygobject3
checkInputs = [
umockdev
];
nativeCheckInputs = [
@ -95,26 +91,13 @@ stdenv.mkDerivation rec {
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
# Avoid double wrapping
dontWrapGApps = true;
postPatch = ''
patchShebangs --build \
tests/integration-test.py \
tests/unittest_inspector.py
'';
postCheck = ''
# Do not contaminate the wrapper with test dependencies.
unset GI_TYPELIB_PATH
unset XDG_DATA_DIRS
'';
postFixup = ''
# Avoid double wrapping
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# Make Python libraries available
wrapPythonProgramsIn "$out/bin" "$pythonPath"
patchShebangs --host \
src/powerprofilesctl
'';
passthru = {