diff options
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r-- | pkgs/data/fonts/rictydiminished-with-firacode/default.nix | 17 | ||||
-rw-r--r-- | pkgs/data/fonts/sudo/default.nix | 10 | ||||
-rwxr-xr-x | pkgs/data/fonts/vazir-fonts/default.nix | 8 |
3 files changed, 16 insertions, 19 deletions
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index bf19fb8238ff..ccfc72dc1809 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, fontforge, python2, python3 }: +{ stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; - version = "1.2.0"; + version = "1.2.2"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; rev = version; - sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace apply-feature.py --replace \ 'ricty = ttLib.TTFont(options.in_font)' \ 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' - substituteInPlace build-py3.py --replace \ + substituteInPlace build.py --replace \ 'datetime.date.today()' \ 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' ''; @@ -30,21 +30,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - # Python 3 not supported by parts of the build system - # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3 - (fontforge.override { - python = python2; - }) (python3.withPackages (ps: [ ps.jinja2 - ps.py3to2 ps.fonttools + ps.fontforge ])) ]; meta = with stdenv.lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; - description = "The best Japanese programming font meets the awesone ligatures of Firacode"; + description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 3906353d82b8..8becdf83f5dc 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,19 +1,21 @@ { lib, fetchzip }: let - version = "0.41"; + version = "0.42"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53"; + sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch"; postFetch = '' - mkdir -p $out/share/fonts/truetype/ + mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/ + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/ ''; meta = with lib; { description = "Font for programmers and command line users"; - homepage = https://www.kutilek.de/sudo-font/; + homepage = "https://www.kutilek.de/sudo-font/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index f39867538099..a41013fd490c 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "19.2.0"; + version = "22.1.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -12,12 +12,12 @@ in fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \; + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l"; + sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc"; meta = with lib; { - homepage = https://github.com/rastikerdar/vazir-font; + homepage = "https://github.com/rastikerdar/vazir-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; license = licenses.ofl; platforms = platforms.all; |