From 1237d58e07f37836f1dced1502003d4c8d168042 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 21:40:05 +0200
Subject: [PATCH 1/2] font-awesome: 6.5.2 -> 6.6.0

---
 pkgs/data/fonts/font-awesome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix
index 8705a07d2593..16000388091e 100644
--- a/pkgs/data/fonts/font-awesome/default.nix
+++ b/pkgs/data/fonts/font-awesome/default.nix
@@ -48,7 +48,7 @@ in
     hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo=";
   };
   v6 = font-awesome {
-    version = "6.5.2";
-    hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw=";
+    version = "6.6.0";
+    hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM=";
   };
 }

From d67000f0aacd4339255a4806cda9fc359f2acc6a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 21:40:41 +0200
Subject: [PATCH 2/2] font-awesome: reformat

---
 pkgs/data/fonts/font-awesome/default.nix | 63 ++++++++++++++----------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix
index 16000388091e..f0622f56cd95 100644
--- a/pkgs/data/fonts/font-awesome/default.nix
+++ b/pkgs/data/fonts/font-awesome/default.nix
@@ -1,35 +1,48 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
 let
-  font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation {
-    pname = "font-awesome";
-    inherit version;
+  font-awesome =
+    {
+      version,
+      hash,
+      rev ? version,
+    }:
+    stdenvNoCC.mkDerivation {
+      pname = "font-awesome";
+      inherit version;
 
-    src = fetchFromGitHub {
-      owner = "FortAwesome";
-      repo = "Font-Awesome";
-      inherit rev hash;
-    };
+      src = fetchFromGitHub {
+        owner = "FortAwesome";
+        repo = "Font-Awesome";
+        inherit rev hash;
+      };
 
-    installPhase = ''
-      runHook preInstall
+      installPhase = ''
+        runHook preInstall
 
-      install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
+        install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
 
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "Font Awesome - OTF font";
-      longDescription = ''
-        Font Awesome gives you scalable vector icons that can instantly be customized.
-        This package includes only the OTF font. For full CSS etc. see the project website.
+        runHook postInstall
       '';
-      homepage = "https://fontawesome.com/";
-      license = licenses.ofl;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abaldeau johnazoidberg ];
+
+      meta = with lib; {
+        description = "Font Awesome - OTF font";
+        longDescription = ''
+          Font Awesome gives you scalable vector icons that can instantly be customized.
+          This package includes only the OTF font. For full CSS etc. see the project website.
+        '';
+        homepage = "https://fontawesome.com/";
+        license = licenses.ofl;
+        platforms = platforms.all;
+        maintainers = with maintainers; [
+          abaldeau
+          johnazoidberg
+        ];
+      };
     };
-  };
 in
 {
   # Keeping version 4 and 5 because version 6 is incompatible for some icons. That