From 05ea6fe871801d4b6d52637f48704a968df060c5 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 5 Aug 2024 13:52:51 +0200 Subject: [PATCH 1/3] fastfetch: applied nixfmt --- pkgs/by-name/fa/fastfetch/package.nix | 242 ++++++++++++++------------ 1 file changed, 126 insertions(+), 116 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index d11bc1cc21eb..f8e72cba0d4f 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -1,46 +1,47 @@ -{ lib -, stdenv -, fetchFromGitHub -, chafa -, cmake -, darwin -, dbus -, dconf -, ddcutil -, glib -, hwdata -, imagemagick_light -, libXrandr -, libdrm -, libglvnd -, libpulseaudio -, libselinux -, libsepol -, libxcb -, makeBinaryWrapper -, networkmanager -, nix-update-script -, ocl-icd -, opencl-headers -, overrideSDK -, pcre -, pcre2 -, pkg-config -, python3 -, rpm -, sqlite -, testers -, util-linux -, vulkan-loader -, wayland -, xfce -, xorg -, yyjson -, zlib -, rpmSupport ? false -, vulkanSupport ? true -, waylandSupport ? true -, x11Support ? true +{ + lib, + stdenv, + fetchFromGitHub, + chafa, + cmake, + darwin, + dbus, + dconf, + ddcutil, + glib, + hwdata, + imagemagick_light, + libXrandr, + libdrm, + libglvnd, + libpulseaudio, + libselinux, + libsepol, + libxcb, + makeBinaryWrapper, + networkmanager, + nix-update-script, + ocl-icd, + opencl-headers, + overrideSDK, + pcre, + pcre2, + pkg-config, + python3, + rpm, + sqlite, + testers, + util-linux, + vulkan-loader, + wayland, + xfce, + xorg, + yyjson, + zlib, + rpmSupport ? false, + vulkanSupport ? true, + waylandSupport ? true, + x11Support ? true, }: let stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; @@ -56,7 +57,10 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-8N2BG9eTZpAvnc1wiG6p7GJSCPfZ+NTbz8kLGPRg5HU="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; nativeBuildInputs = [ cmake @@ -65,79 +69,84 @@ stdenv'.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - chafa - imagemagick_light - pcre - pcre2 - sqlite - yyjson - ] ++ lib.optionals stdenv.isLinux [ - dbus - dconf - ddcutil - glib - hwdata - libdrm - libpulseaudio - libselinux - libsepol - networkmanager - ocl-icd - opencl-headers - util-linux - zlib - ] ++ lib.optionals rpmSupport [ - rpm - ] ++ lib.optionals vulkanSupport [ - vulkan-loader - ] ++ lib.optionals waylandSupport [ - wayland - ] ++ lib.optionals x11Support [ - libXrandr - libglvnd - libxcb - xorg.libXau - xorg.libXdmcp - xorg.libXext - ] ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ - xfce.xfconf - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Apple80211 - AppKit - AVFoundation - Cocoa - CoreDisplay - CoreVideo - CoreWLAN - DisplayServices - IOBluetooth - MediaRemote - OpenCL - SystemConfiguration - darwin.moltenvk - ]); + buildInputs = + [ + chafa + imagemagick_light + pcre + pcre2 + sqlite + yyjson + ] + ++ lib.optionals stdenv.isLinux [ + dbus + dconf + ddcutil + glib + hwdata + libdrm + libpulseaudio + libselinux + libsepol + networkmanager + ocl-icd + opencl-headers + util-linux + zlib + ] + ++ lib.optionals rpmSupport [ rpm ] + ++ lib.optionals vulkanSupport [ vulkan-loader ] + ++ lib.optionals waylandSupport [ wayland ] + ++ lib.optionals x11Support [ + libXrandr + libglvnd + libxcb + xorg.libXau + xorg.libXdmcp + xorg.libXext + ] + ++ lib.optionals (x11Support && (!stdenv.isDarwin)) [ xfce.xfconf ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; + [ + Apple80211 + AppKit + AVFoundation + Cocoa + CoreDisplay + CoreVideo + CoreWLAN + DisplayServices + IOBluetooth + MediaRemote + OpenCL + SystemConfiguration + darwin.moltenvk + ] + ); - cmakeFlags = [ - (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") - (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) - (lib.cmakeBool "ENABLE_DRM" false) - (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) - (lib.cmakeBool "ENABLE_OSMESA" false) - (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) - (lib.cmakeBool "ENABLE_GLX" x11Support) - (lib.cmakeBool "ENABLE_RPM" rpmSupport) - (lib.cmakeBool "ENABLE_VULKAN" x11Support) - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - (lib.cmakeBool "ENABLE_X11" x11Support) - (lib.cmakeBool "ENABLE_XCB" x11Support) - (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) - (lib.cmakeBool "ENABLE_XRANDR" x11Support) - ] ++ lib.optionals stdenv.isLinux [ - (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") - (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") - ]; + cmakeFlags = + [ + (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") + (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) + (lib.cmakeBool "ENABLE_DRM" false) + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) + (lib.cmakeBool "ENABLE_OSMESA" false) + (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) + (lib.cmakeBool "ENABLE_GLX" x11Support) + (lib.cmakeBool "ENABLE_RPM" rpmSupport) + (lib.cmakeBool "ENABLE_VULKAN" x11Support) + (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) + (lib.cmakeBool "ENABLE_X11" x11Support) + (lib.cmakeBool "ENABLE_XCB" x11Support) + (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) + (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) + (lib.cmakeBool "ENABLE_XRANDR" x11Support) + ] + ++ lib.optionals stdenv.isLinux [ + (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") + (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") + ]; postPatch = '' substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}' @@ -162,6 +171,7 @@ stdenv'.mkDerivation (finalAttrs: { meta = { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; + changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaneliman ]; platforms = lib.platforms.all; From 426a3fb50116aff2a9404aaa2a3ed5e849a10c86 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 5 Aug 2024 16:09:47 +0200 Subject: [PATCH 2/3] fastfetch: 2.20.0 -> 2.21.0 --- pkgs/by-name/fa/fastfetch/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index f8e72cba0d4f..917d746cb2c3 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -19,7 +19,6 @@ libsepol, libxcb, makeBinaryWrapper, - networkmanager, nix-update-script, ocl-icd, opencl-headers, @@ -48,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-8N2BG9eTZpAvnc1wiG6p7GJSCPfZ+NTbz8kLGPRg5HU="; + hash = "sha256-1bWWwMzbzECWARhl3ULMVF5QhbvrV5ShVT382BnRGg8="; }; outputs = [ @@ -88,7 +87,6 @@ stdenv'.mkDerivation (finalAttrs: { libpulseaudio libselinux libsepol - networkmanager ocl-icd opencl-headers util-linux From ca9a18769fe93fa5edb0eb48b63213e4c715fa63 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 5 Aug 2024 16:20:48 +0200 Subject: [PATCH 3/3] fastfetch: add luftmensch-luftmensch maintainer --- pkgs/by-name/fa/fastfetch/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 917d746cb2c3..ce0bd1827e60 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -171,7 +171,10 @@ stdenv'.mkDerivation (finalAttrs: { homepage = "https://github.com/fastfetch-cli/fastfetch"; changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ khaneliman ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + khaneliman + ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; };