From ee967c77a2cea3caf4981a6aec84b33133165a59 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:36:08 +0100 Subject: fira-mono: migrate to by-name --- pkgs/by-name/fi/fira-mono/package.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/fi/fira-mono/package.nix (limited to 'pkgs/by-name/fi') diff --git a/pkgs/by-name/fi/fira-mono/package.nix b/pkgs/by-name/fi/fira-mono/package.nix new file mode 100644 index 0000000000000..5d059dbf88e08 --- /dev/null +++ b/pkgs/by-name/fi/fira-mono/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "fira-mono"; + version = "4.202"; + + src = fetchzip { + url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://mozilla.github.io/Fira/"; + description = "Monospace font for Firefox OS"; + longDescription = '' + Fira Mono is a monospace font designed by Erik Spiekermann, + Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois + Type Design for Mozilla Firefox OS. Available in Regular, + Medium, and Bold. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} -- cgit 1.4.1 From 81b35a5dbe2b15ab89a33587925d7d7974532461 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:37:30 +0100 Subject: fira-sans: init at 4.202 --- pkgs/by-name/fi/fira-sans/package.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/fi/fira-sans/package.nix (limited to 'pkgs/by-name/fi') diff --git a/pkgs/by-name/fi/fira-sans/package.nix b/pkgs/by-name/fi/fira-sans/package.nix new file mode 100644 index 0000000000000..c07cc15c97cce --- /dev/null +++ b/pkgs/by-name/fi/fira-sans/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, fira-mono +}: + +stdenvNoCC.mkDerivation { + pname = "fira-sans"; + inherit (fira-mono) version src; + + installPhase = '' + runHook preInstall + + install --mode=-x -Dt $out/share/fonts/opentype otf/FiraSans*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://mozilla.github.io/Fira/"; + description = "Sans-serif font for Firefox OS"; + longDescription = '' + Fira Sans is a sans-serif font designed by Erik Spiekermann, + Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois + Type Design for Mozilla Firefox OS. It is closely related to + Spiekermann's FF Meta typeface. Available in Two, Four, Eight, + Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular, + Medium, Semi Bold, Bold, Extra Bold, Heavy weights with + corresponding italic versions. + ''; + license = licenses.ofl; + platforms = platforms.all; + }; +} -- cgit 1.4.1 From 4d22cc500f34560853d561d80f4aa980d98efd10 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Jan 2024 20:38:01 +0100 Subject: fira: migrate to by-name, refactor --- pkgs/by-name/fi/fira/package.nix | 23 +++++++++++++++++++++++ pkgs/data/fonts/fira/default.nix | 37 ------------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/fi/fira/package.nix delete mode 100644 pkgs/data/fonts/fira/default.nix (limited to 'pkgs/by-name/fi') diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix new file mode 100644 index 0000000000000..405189ba2e99f --- /dev/null +++ b/pkgs/by-name/fi/fira/package.nix @@ -0,0 +1,23 @@ +{ lib +, symlinkJoin +, fira-mono +, fira-sans +}: + +symlinkJoin rec { + pname = "fira"; + inherit (fira-mono) version; + name = "${pname}-${version}"; + + paths = [ + fira-mono + fira-sans + ]; + + meta = { + description = "Fira font family including Fira Sans and Fira Mono"; + homepage = "https://mozilla.github.io/Fira/"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix deleted file mode 100644 index 4b79d14dd94e7..0000000000000 --- a/pkgs/data/fonts/fira/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: - -stdenvNoCC.mkDerivation rec { - pname = "fira"; - version = "4.202"; - - src = fetchFromGitHub { - owner = "mozilla"; - repo = "Fira"; - rev = version; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; - }; - - installPhase = '' - runHook preInstall - - install --mode=-x -Dt $out/share/fonts/opentype otf/*.otf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; - description = "Sans-serif font for Firefox OS"; - longDescription = '' - Fira Sans is a sans-serif font designed by Erik Spiekermann, - Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois - Type Design for Mozilla Firefox OS. It is closely related to - Spiekermann's FF Meta typeface. Available in Two, Four, Eight, - Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular, - Medium, Semi Bold, Bold, Extra Bold, Heavy weights with - corresponding italic versions. - ''; - license = licenses.ofl; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b7e7f083db72..bcde98314bd0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29312,8 +29312,6 @@ with pkgs; fanwood = callPackage ../data/fonts/fanwood { }; - fira = callPackage ../data/fonts/fira { }; - fira-code = callPackage ../data/fonts/fira-code { }; fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; fira-code-nerdfont = nerdfonts.override { -- cgit 1.4.1