From f8f771c167af22846abe817ac514337c20e3e465 Mon Sep 17 00:00:00 2001
From: Daudi Wampamba <me@daudi,dev>
Date: Sat, 13 Dec 2025 21:46:01 +0000
Subject: [PATCH] fira: correct references from 'bboxtype' to 'carrois'

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/fi/fira-go/package.nix   | 14 +++++++-------
 pkgs/by-name/fi/fira-mono/package.nix |  4 ++--
 pkgs/by-name/fi/fira-sans/package.nix |  6 +++---
 pkgs/by-name/fi/fira/package.nix      |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fi/fira-go/package.nix b/pkgs/by-name/fi/fira-go/package.nix
index e0830c0e3861..c7458d9ea699 100644
--- a/pkgs/by-name/fi/fira-go/package.nix
+++ b/pkgs/by-name/fi/fira-go/package.nix
@@ -4,27 +4,27 @@
   fetchzip,
 }:
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation rec {
   pname = "fira-go";
   version = "1.001";
 
   src = fetchzip {
-    url = "https://github.com/bBoxType/FiraGo/archive/9882ba0851f88ab904dc237f250db1d45641f45d.zip";
-    hash = "sha256-WwgPg7OLrXBjR6oHG5061RO3HeNkj2Izs6ktwIxVw9o=";
+    url = "https://carrois.com/downloads/FiraGO/Download_Folder_FiraGO_${
+      lib.replaceStrings [ "." ] [ "" ] version
+    }.zip";
+    hash = "sha256-+lw4dh7G/Xv3pzGXdMUl9xNc2Nk7wUOAh+lq3K1LrXs=";
   };
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/fonts/opentype
-    mv Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \
-      $out/share/fonts/opentype
+    install --mode=644 -Dt $out/share/fonts/opentype Download_Folder_FiraGO*/Fonts/FiraGO_OTF*/*/*.otf
 
     runHook postInstall
   '';
 
   meta = {
-    homepage = "https://bboxtype.com/typefaces/FiraGO";
+    homepage = "https://carrois.com/fira/";
     description = ''
       Font with the same glyph set as Fira Sans 4.3 and additionally
       supports Arabic, Devenagari, Georgian, Hebrew and Thai
diff --git a/pkgs/by-name/fi/fira-mono/package.nix b/pkgs/by-name/fi/fira-mono/package.nix
index f7af266fe7b6..e6588d8e0e81 100644
--- a/pkgs/by-name/fi/fira-mono/package.nix
+++ b/pkgs/by-name/fi/fira-mono/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "3.2";
 
   src = fetchzip {
-    url = "https://bboxtype.com/downloads/Fira/Fira_Mono_${
+    url = "https://carrois.com/downloads/Fira/Fira_Mono_${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
     hash = "sha256-Ukc+K2sdSz+vUQFD8mmwJHZQ3N68oM4fk6YzGLwzAfQ=";
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://bboxtype.com/fira/";
+    homepage = "https://carrois.com/fira/";
     description = "Monospace font for Firefox OS";
     longDescription = ''
       Fira Mono is a monospace font designed by Erik Spiekermann,
diff --git a/pkgs/by-name/fi/fira-sans/package.nix b/pkgs/by-name/fi/fira-sans/package.nix
index 97e0ee797df4..4dd3a09ccb74 100644
--- a/pkgs/by-name/fi/fira-sans/package.nix
+++ b/pkgs/by-name/fi/fira-sans/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "4.301";
 
   src = fetchzip {
-    url = "https://bboxtype.com/downloads/Fira/Download_Folder_FiraSans_${
+    url = "https://carrois.com/downloads/Fira/Download_Folder_FiraSans_${
       lib.replaceStrings [ "." ] [ "" ] version
     }.zip";
     hash = "sha256-WBt3oqPK7ACqMhilYkyFx9Ek2ugwdCDFZN+8HLRnGRs";
@@ -19,13 +19,13 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install --mode=-x -Dt $out/share/fonts/opentype Download_Folder_FiraSans*/Fonts/Fira_Sans_OTF*/*/*/*.otf
+    install --mode=644 -Dt $out/share/fonts/opentype Download_Folder_FiraSans*/Fonts/Fira_Sans_OTF*/*/*/*.otf
 
     runHook postInstall
   '';
 
   meta = {
-    homepage = "https://bboxtype.com/fira/";
+    homepage = "https://carrois.com/fira/";
     description = "Sans-serif font for Firefox OS";
     longDescription = ''
       Fira Sans is a sans-serif font designed by Erik Spiekermann,
diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix
index 6c317c016808..0c7eade25869 100644
--- a/pkgs/by-name/fi/fira/package.nix
+++ b/pkgs/by-name/fi/fira/package.nix
@@ -17,7 +17,7 @@ symlinkJoin rec {
 
   meta = {
     description = "Font family including Fira Sans and Fira Mono";
-    homepage = "https://bboxtype.com/fira/";
+    homepage = "https://carrois.com/fira/";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
   };