From 029b8c50ea3fc4fa2dc1ce8495c36faf1d7b5578 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 23 Nov 2024 02:52:16 +0100 Subject: [PATCH] coolercontrol.*: nixfmt, drop meta-wide "with lib" --- .../coolercontrol/coolercontrol-gui.nix | 32 ++++++++++--------- .../coolercontrol/coolercontrol-liqctld.nix | 14 ++++---- .../coolercontrol/coolercontrol-ui-data.nix | 15 ++++----- .../system/coolercontrol/coolercontrold.nix | 22 ++++++------- .../system/coolercontrol/default.nix | 16 ++++++---- 5 files changed, 50 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 5402ebac181b..f6f9c95c0e95 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,20 +1,22 @@ -{ lib -, rustPlatform -, dbus -, freetype -, gtk3 -, libsoup_3 -, openssl -, pkg-config -, webkitgtk_4_1 -, libappindicator -, makeWrapper -, coolercontrol +{ + lib, + rustPlatform, + dbus, + freetype, + gtk3, + libsoup_3, + openssl, + pkg-config, + webkitgtk_4_1, + libappindicator, + makeWrapper, + coolercontrol, }: -{ version -, src -, meta +{ + version, + src, + meta, }: rustPlatform.buildRustPackage { diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix index 38a929c813e8..2dc770421e9f 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix @@ -1,9 +1,9 @@ -{ python3 -}: +{ python3 }: -{ version -, src -, meta +{ + version, + src, + meta, }: python3.pkgs.buildPythonApplication { @@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication { sourceRoot = "${src.name}/coolercontrol-liqctld"; format = "pyproject"; - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; + nativeBuildInputs = with python3.pkgs; [ setuptools ]; propagatedBuildInputs = with python3.pkgs; [ liquidctl diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index de1f54252201..6906769b44ad 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -1,10 +1,9 @@ -{ buildNpmPackage -, autoPatchelfHook -}: +{ buildNpmPackage, autoPatchelfHook }: -{ version -, src -, meta +{ + version, + src, + meta, }: buildNpmPackage { @@ -18,9 +17,7 @@ buildNpmPackage { autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart ''; - nativeBuildInputs = [ - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; dontAutoPatchelf = true; diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 27530d613f47..76c42cf30039 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,13 +1,15 @@ -{ rustPlatform -, testers -, libdrm -, coolercontrol -, runtimeShell +{ + rustPlatform, + testers, + libdrm, + coolercontrol, + runtimeShell, }: -{ version -, src -, meta +{ + version, + src, + meta, }: rustPlatform.buildRustPackage { @@ -18,9 +20,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I="; - buildInputs = [ - libdrm - ]; + buildInputs = [ libdrm ]; postPatch = '' # copy the frontend static resources to a directory for embedding diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 9e67f50969b7..89cb7f0e9c37 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitLab -, callPackage +{ + lib, + fetchFromGitLab, + callPackage, }: let @@ -13,12 +14,15 @@ let hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg="; }; - meta = with lib; { + meta = { description = "Monitor and control your cooling devices"; homepage = "https://gitlab.com/coolercontrol/coolercontrol"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ codifryed OPNA2608 ]; + maintainers = with lib.maintainers; [ + codifryed + OPNA2608 + ]; }; applySharedDetails = drv: drv { inherit version src meta; };