From ca545c062e987987fc0bebfd8c1c0c8604dc9bb3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 15 Aug 2024 21:07:38 +0200 Subject: [PATCH] ayatana-indicator-session: nixfmt, modernise --- .../ay/ayatana-indicator-session/package.nix | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 7a625b94eb49..bd8e7aa9a059 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchFromGitHub -, gitUpdater -, nixosTests -, cmake -, dbus -, glib -, gnome -, gsettings-desktop-schemas -, gtest -, intltool -, libayatana-common -, librda -, lomiri -, mate -, pkg-config -, systemd -, wrapGAppsHook3 +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + nixosTests, + cmake, + dbus, + glib, + gnome, + gsettings-desktop-schemas, + gtest, + intltool, + libayatana-common, + librda, + lomiri, + mate, + pkg-config, + systemd, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; - rev = finalAttrs.version; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0="; }; @@ -61,13 +62,9 @@ stdenv.mkDerivation (finalAttrs: { mate.mate-settings-daemon ]; - nativeCheckInputs = [ - dbus - ]; + nativeCheckInputs = [ dbus ]; - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) @@ -86,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Ayatana Indicator showing session management, status and user switching"; longDescription = '' This Ayatana Indicator is designed to be placed on the right side of a @@ -98,8 +95,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-session"; changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.linux; }; })