From 363e6d2d986cbb27b91a6855d3bfccc8c21c68c1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 15 Aug 2024 21:23:17 +0200 Subject: [PATCH] lomiri.lomiri-indicator-network: nixfmt, modernise --- .../lomiri-indicator-network/default.nix | 81 +++++++++---------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index a24de68abbcd..29ef6a312d62 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -1,32 +1,33 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, nixosTests -, testers -, cmake -, cmake-extras -, coreutils -, dbus -, doxygen -, gettext -, glib -, gmenuharness -, gtest -, intltool -, libsecret -, libqofono -, libqtdbusmock -, libqtdbustest -, lomiri-api -, lomiri-url-dispatcher -, networkmanager -, ofono -, pkg-config -, python3 -, qtdeclarative -, qtbase -, validatePkgConfig +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + nixosTests, + testers, + cmake, + cmake-extras, + coreutils, + dbus, + doxygen, + gettext, + glib, + gmenuharness, + gtest, + intltool, + libsecret, + libqofono, + libqtdbusmock, + libqtdbustest, + lomiri-api, + lomiri-url-dispatcher, + networkmanager, + ofono, + pkg-config, + python3, + qtdeclarative, + qtbase, + validatePkgConfig, }: stdenv.mkDerivation (finalAttrs: { @@ -78,11 +79,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase ]; - nativeCheckInputs = [ - (python3.withPackages (ps: with ps; [ - python-dbusmock - ])) - ]; + nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ]; checkInputs = [ gmenuharness @@ -109,9 +106,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - ayatana-indicators = [ - "lomiri-indicator-network" - ]; + ayatana-indicators = [ "lomiri-indicator-network" ]; tests = { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; vm = nixosTests.ayatana-indicators; @@ -119,15 +114,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Ayatana indiator exporting the network settings menu through D-Bus"; homepage = "https://gitlab.com/ubports/development/core/lomiri-indicator-network"; changelog = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; - pkgConfigModules = [ - "lomiri-connectivity-qt1" - ]; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + pkgConfigModules = [ "lomiri-connectivity-qt1" ]; }; })