From 6702a5913060afc4bb3a966d43e8159b3f7c440e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Sep 2023 04:20:00 +0000 Subject: [PATCH 1/3] mona-sans: 1.0 -> 1.0.1 Diff: https://github.com/github/mona-sans/compare/v1.0...v1.0.1 Changelog: https://github.com/github/mona-sans/releases/tag/v1.0.1 --- pkgs/data/fonts/mona-sans/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/data/fonts/mona-sans/default.nix index b43a01b4fec..d68e0b65c22 100644 --- a/pkgs/data/fonts/mona-sans/default.nix +++ b/pkgs/data/fonts/mona-sans/default.nix @@ -5,22 +5,24 @@ stdenvNoCC.mkDerivation rec { pname = "mona-sans"; - version = "1.0"; + version = "1.0.1"; src = fetchFromGitHub { - rev = "v" + version; + rev = "v${version}"; owner = "github"; - repo = pname; - sha256 = "iJhbSGNByOvtJd9hEh0g7Ht6eoAJ18jco0oHGqjOiLQ="; + repo = "mona-sans"; + sha256 = "sha256-XvqLFzlgIqx9aZH2SEAtwMiuWgUiDi/gHGSpfreUHuk="; }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/mona-sans -D $src/dist/*.ttf + install -D -m444 -t $out/share/fonts/opentype fonts/otf/*.otf + install -D -m444 -t $out/share/fonts/truetype fonts/ttf/*.ttf fonts/variable/*.ttf ''; meta = { description = "A variable font from GitHub"; homepage = "https://github.com/github/mona-sans"; + changelog = "https://github.com/github/mona-sans/releases/tag/v${version}"; license = lib.licenses.ofl; longDescription = '' A strong and versatile typeface, designed together with Degarism and From 0c0688da298bbcdc2946df37b9c3a55f4d98a23c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Sep 2023 10:30:00 -0500 Subject: [PATCH 2/3] mona-sans: use finalAttrs pattern --- pkgs/data/fonts/mona-sans/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/data/fonts/mona-sans/default.nix index d68e0b65c22..a35ba718688 100644 --- a/pkgs/data/fonts/mona-sans/default.nix +++ b/pkgs/data/fonts/mona-sans/default.nix @@ -3,12 +3,12 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mona-sans"; version = "1.0.1"; src = fetchFromGitHub { - rev = "v${version}"; + rev = "v${finalAttrs.version}"; owner = "github"; repo = "mona-sans"; sha256 = "sha256-XvqLFzlgIqx9aZH2SEAtwMiuWgUiDi/gHGSpfreUHuk="; @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "A variable font from GitHub"; homepage = "https://github.com/github/mona-sans"; - changelog = "https://github.com/github/mona-sans/releases/tag/v${version}"; + changelog = "https://github.com/github/mona-sans/releases/tag/v${finalAttrs.version}"; license = lib.licenses.ofl; longDescription = '' A strong and versatile typeface, designed together with Degarism and @@ -38,4 +38,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.all; }; -} +}) From cd07886ba7a65a41573e71f8805c5323b92862c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 Sep 2023 10:30:00 -0500 Subject: [PATCH 3/3] mona-sans: update homepage --- pkgs/data/fonts/mona-sans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/data/fonts/mona-sans/default.nix index a35ba718688..c73653c76ec 100644 --- a/pkgs/data/fonts/mona-sans/default.nix +++ b/pkgs/data/fonts/mona-sans/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "A variable font from GitHub"; - homepage = "https://github.com/github/mona-sans"; + homepage = "https://github.com/mona-sans"; changelog = "https://github.com/github/mona-sans/releases/tag/v${finalAttrs.version}"; license = lib.licenses.ofl; longDescription = ''