rictydiminished-with-firacode: 1.2.0 → 1.2.2

This commit is contained in:
Jan Tojnar 2020-02-24 03:10:20 +01:00
parent 2702da0d8f
commit 10c7a4d176
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,13 +1,13 @@
{ stdenv, fetchgit, fontforge, python2, python3 }: { stdenv, fetchgit, fontforge, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rictydiminished-with-firacode"; pname = "rictydiminished-with-firacode";
version = "1.2.0"; version = "1.2.2";
src = fetchgit { src = fetchgit {
url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
rev = version; rev = version;
sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn"; sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace apply-feature.py --replace \ substituteInPlace apply-feature.py --replace \
'ricty = ttLib.TTFont(options.in_font)' \ 'ricty = ttLib.TTFont(options.in_font)' \
'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)'
substituteInPlace build-py3.py --replace \ substituteInPlace build.py --replace \
'datetime.date.today()' \ 'datetime.date.today()' \
'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))'
''; '';
@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ 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: [ (python3.withPackages (ps: [
ps.jinja2 ps.jinja2
ps.py3to2
ps.fonttools ps.fonttools
ps.fontforge
])) ]))
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; 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; license = licenses.ofl;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ mt-caret ]; maintainers = with maintainers; [ mt-caret ];