From 3fd5f63834b67e27c9a16a3a7c8239f21bcd6055 Mon Sep 17 00:00:00 2001
From: Fernando Silva <fernandonsilva16@gmail.com>
Date: Mon, 9 May 2022 13:08:53 -0300
Subject: font-awesome: 5.15.3 -> 6.1.1

---
 pkgs/data/fonts/font-awesome-5/default.nix | 45 --------------------------
 pkgs/data/fonts/font-awesome/default.nix   | 51 ++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/data/fonts/font-awesome-5/default.nix
 create mode 100644 pkgs/data/fonts/font-awesome/default.nix

(limited to 'pkgs/data')

diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
deleted file mode 100644
index 7f251232ebc10..0000000000000
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, fetchFromGitHub }:
-let
-  font-awesome = { version, sha256, rev ? version}: fetchFromGitHub {
-    name = "font-awesome-${version}";
-
-
-    owner = "FortAwesome";
-    repo = "Font-Awesome";
-    inherit rev;
-
-    postFetch = ''
-      tar xf $downloadedFile --strip=1
-      install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
-    '';
-
-    inherit sha256;
-
-    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 = "http://fortawesome.github.io/Font-Awesome/";
-      license = licenses.ofl;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abaldeau johnazoidberg ];
-    };
-  };
-in {
-  # Keeping version 4 because version 5 is incompatible for some icons. That
-  # means that projects which depend on it need to actively convert the
-  # symbols. See:
-  # https://github.com/greshake/i3status-rust/issues/130
-  # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
-  v4 = font-awesome {
-    version = "4.7.0";
-    rev = "v4.7.0";
-    sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
-  };
-  v5 = font-awesome {
-    version = "5.15.3";
-    sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0=";
-  };
-}
diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix
new file mode 100644
index 0000000000000..3403660b1e8ff
--- /dev/null
+++ b/pkgs/data/fonts/font-awesome/default.nix
@@ -0,0 +1,51 @@
+{ lib, fetchFromGitHub }:
+let
+  font-awesome = { version, sha256, rev ? version }: fetchFromGitHub {
+    name = "font-awesome-${version}";
+
+
+    owner = "FortAwesome";
+    repo = "Font-Awesome";
+    inherit rev;
+
+    postFetch = ''
+      tar xf $downloadedFile --strip=1
+      install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
+    '';
+
+    inherit sha256;
+
+    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
+  # means that projects which depend on it need to actively convert the
+  # symbols. See:
+  # https://github.com/greshake/i3status-rust/issues/130
+  # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
+  # https://fontawesome.com/v6/docs/web/setup/upgrade/
+  v4 = font-awesome {
+    version = "4.7.0";
+    rev = "v4.7.0";
+    sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
+  };
+  v5 = font-awesome {
+    version = "5.15.3";
+    sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0=";
+  };
+  v6 = font-awesome {
+    version = "6.1.1";
+    sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA";
+  };
+}
-- 
cgit 1.4.1