From 7d2350b795e7a9e2fe45a8c290be3f0d329799be Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:54:33 +0200 Subject: [PATCH 1/4] power-profiles-daemon: reformat with nixfmt --- .../linux/power-profiles-daemon/default.nix | 112 ++++++++++-------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 1c3dc9acab4d..0a4c7f67560c 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -1,35 +1,39 @@ -{ stdenv -, lib -, bash-completion -, pkg-config -, meson -, mesonEmulatorHook -, ninja -, fetchFromGitLab -, libgudev -, glib -, polkit -, dbus -, gobject-introspection -, wrapGAppsNoGuiHook -, gettext -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, libxml2 -, libxslt -, upower -, umockdev -, systemd -, python3 -, nixosTests +{ + stdenv, + lib, + bash-completion, + pkg-config, + meson, + mesonEmulatorHook, + ninja, + fetchFromGitLab, + libgudev, + glib, + polkit, + dbus, + gobject-introspection, + wrapGAppsNoGuiHook, + gettext, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_412, + libxml2, + libxslt, + upower, + umockdev, + systemd, + python3, + nixosTests, }: stdenv.mkDerivation rec { pname = "power-profiles-daemon"; version = "0.22"; - outputs = [ "out" "devdoc" ]; + outputs = [ + "out" + "devdoc" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -39,29 +43,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-NzaneS/Za73HSK2abBZNmP+ZPbhIG+JXfBTPHm2vBeU="; }; - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 - libxml2 # for xmllint for stripping GResources - libxslt # for xsltproc for building docs - gobject-introspection - wrapGAppsNoGuiHook - # checkInput but cheked for during the configuring - (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ - pygobject3 - dbus-python - python-dbusmock - argparse-manpage - shtab - ])) - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; + nativeBuildInputs = + [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + wrapGAppsNoGuiHook + # checkInput but checked for during the configuring + (python3.pythonOnBuildForHost.withPackages ( + ps: with ps; [ + pygobject3 + dbus-python + python-dbusmock + argparse-manpage + shtab + ] + )) + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ bash-completion @@ -127,6 +135,10 @@ stdenv.mkDerivation rec { mainProgram = "powerprofilesctl"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mvnetbiz picnoir lyndeno ]; + maintainers = with maintainers; [ + mvnetbiz + picnoir + lyndeno + ]; }; } From 916f08fab3ca9fb8dd99aa0a96a7c6edd2c011ef Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:56:14 +0200 Subject: [PATCH 2/4] power-profiles-daemon: move to pkgs/by-name --- .../po/power-profiles-daemon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{os-specific/linux/power-profiles-daemon/default.nix => by-name/po/power-profiles-daemon/package.nix} (100%) diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix similarity index 100% rename from pkgs/os-specific/linux/power-profiles-daemon/default.nix rename to pkgs/by-name/po/power-profiles-daemon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69e98c04372a..a2fcab62e4a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11613,8 +11613,6 @@ with pkgs; stdenv = gcc12Stdenv; }; - power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; - ppl = callPackage ../development/libraries/ppl { }; pplite = callPackage ../development/libraries/pplite { }; From 122e267f17bed0da20ecbd9767cad29521987ae9 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:58:25 +0200 Subject: [PATCH 3/4] power-profiles-daemon: use finalAttrs --- pkgs/by-name/po/power-profiles-daemon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index 0a4c7f67560c..cee6fa727890 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -26,7 +26,7 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "power-profiles-daemon"; version = "0.22"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "upower"; repo = "power-profiles-daemon"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-NzaneS/Za73HSK2abBZNmP+ZPbhIG+JXfBTPHm2vBeU="; }; @@ -141,4 +141,4 @@ stdenv.mkDerivation rec { lyndeno ]; }; -} +}) From 0436990db5df100bdd2a845af04fe78532a7eb55 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 14:59:17 +0200 Subject: [PATCH 4/4] power-profiles-daemon: add updateScript --- pkgs/by-name/po/power-profiles-daemon/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index cee6fa727890..c1fb546461e4 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -24,6 +24,7 @@ systemd, python3, nixosTests, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -124,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + updateScript = nix-update-script { }; tests = { nixos = nixosTests.power-profiles-daemon; };