From 31087f80fb7becf83410b52aaedee26b5ae5611b Mon Sep 17 00:00:00 2001 From: whipplash Date: Sun, 6 Oct 2024 16:16:59 -0400 Subject: [PATCH 1/5] sarasa-term-nerdfont: init at 1.1.0 --- .../sa/sarasa-term-nerdfont/package.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/sa/sarasa-term-nerdfont/package.nix diff --git a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix new file mode 100644 index 000000000000000..5a350920a9c7607 --- /dev/null +++ b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenvNoCC, fetchurl, unzip, }: + +stdenvNoCC.mkDerivation rec { + pname = "sarasa-term-sc-nerd"; + version = "v1.1.0"; + + src = fetchurl { + url = "https://github.com/laishulu/Sarasa-Term-SC-Nerd/releases/download/${version}/sarasa-term-sc-nerd.ttf.tar.gz"; + hash = "sha256-ADS5KTYQMTELd8MjAE+ugEwC5Gr8qDpN5kPirvgogAc="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + description = "Font based on Sarasa Term SC font."; + longDescription = "Sarasa Term SC Nerd font is based on Sarasa Term SC font. Nerd fonts + patch program is modified, Nerd fonts is merged into Sarasa Term SC by this program, + and then some post-processing is done to form the final font. + + This font is especially suitable for Simplified Chinese users to use in terminal or code editor."; + homepage = "https://github.com/laishulu/Sarasa-Term-SC-Nerd"; + license = licenses.ofl; + maintainers = with maintainers; [ mkenkel ]; + platforms = platforms.all; + }; +} + From a1093c9709ee6fd1ead81de374cdbacb33663b0f Mon Sep 17 00:00:00 2001 From: whipplash Date: Sun, 6 Oct 2024 16:52:14 -0400 Subject: [PATCH 2/5] nixfmt --- pkgs/by-name/sa/sarasa-term-nerdfont/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix index 5a350920a9c7607..115d0fa8afcf354 100644 --- a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix +++ b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix @@ -24,9 +24,9 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Font based on Sarasa Term SC font."; - longDescription = "Sarasa Term SC Nerd font is based on Sarasa Term SC font. Nerd fonts - patch program is modified, Nerd fonts is merged into Sarasa Term SC by this program, - and then some post-processing is done to form the final font. + longDescription = "Sarasa Term SC Nerd font is based on Sarasa Term SC font. Nerd fonts + patch program is modified, Nerd fonts is merged into Sarasa Term SC by this program, + and then some post-processing is done to form the final font. This font is especially suitable for Simplified Chinese users to use in terminal or code editor."; homepage = "https://github.com/laishulu/Sarasa-Term-SC-Nerd"; From 385f007021851c539b5ec68b5c8d1105fa2dda6b Mon Sep 17 00:00:00 2001 From: whipplash Date: Sun, 6 Oct 2024 16:55:14 -0400 Subject: [PATCH 3/5] nixfmt --- pkgs/by-name/sa/sarasa-term-nerdfont/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix index 115d0fa8afcf354..b350a758b6ad24b 100644 --- a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix +++ b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchurl, unzip, }: +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: stdenvNoCC.mkDerivation rec { pname = "sarasa-term-sc-nerd"; @@ -35,4 +40,3 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; }; } - From 64fafe6b4894c95727fce8bade41a33e0f6ce51b Mon Sep 17 00:00:00 2001 From: mkenkel <35666729+mkenkel@users.noreply.github.com> Date: Sun, 6 Oct 2024 17:01:59 -0400 Subject: [PATCH 4/5] Apply suggestions from code review Thanks for the quick turnaround! Co-authored-by: Daniil Nartsissov --- pkgs/by-name/sa/sarasa-term-nerdfont/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix index b350a758b6ad24b..fe9b9d51ff48cf3 100644 --- a/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix +++ b/pkgs/by-name/sa/sarasa-term-nerdfont/package.nix @@ -7,10 +7,10 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-term-sc-nerd"; - version = "v1.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://github.com/laishulu/Sarasa-Term-SC-Nerd/releases/download/${version}/sarasa-term-sc-nerd.ttf.tar.gz"; + url = "https://github.com/laishulu/Sarasa-Term-SC-Nerd/releases/download/v${version}/sarasa-term-sc-nerd.ttf.tar.gz"; hash = "sha256-ADS5KTYQMTELd8MjAE+ugEwC5Gr8qDpN5kPirvgogAc="; }; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Font based on Sarasa Term SC font."; longDescription = "Sarasa Term SC Nerd font is based on Sarasa Term SC font. Nerd fonts patch program is modified, Nerd fonts is merged into Sarasa Term SC by this program, @@ -35,8 +35,8 @@ stdenvNoCC.mkDerivation rec { This font is especially suitable for Simplified Chinese users to use in terminal or code editor."; homepage = "https://github.com/laishulu/Sarasa-Term-SC-Nerd"; - license = licenses.ofl; - maintainers = with maintainers; [ mkenkel ]; - platforms = platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ mkenkel ]; + platforms = lib.platforms.all; }; } From b1c822a2cd708015a8450228d89a4e0741a3cc69 Mon Sep 17 00:00:00 2001 From: whipplash Date: Sun, 6 Oct 2024 19:00:19 -0400 Subject: [PATCH 5/5] Maintainer add my ID --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5db8d13fd65622f..2896dc304798fac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14087,6 +14087,12 @@ githubId = 5698461; name = "Maciej Kazulak"; }; + mkenkel = { + email = "mattsnoopy2@gmail.com"; + github = "mkenkel"; + githubId = 35666729; + name = "Matthew Kenkel"; + }; mkez = { email = "matias+nix@zwinger.fi"; github = "mk3z";