Merge pull request #88533 from rileyinman/iosevka-update

iosevka, iosevka-bin: 2.3.3 -> 3.2.2
This commit is contained in:
Thomas Tuegel 2020-07-07 08:51:21 -05:00 committed by GitHub
commit daec48f47c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2646 additions and 2117 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchzip }: { stdenv, fetchzip }:
let let
version = "2.3.3"; version = "3.2.2";
in fetchzip { in fetchzip {
name = "iosevka-bin-${version}"; name = "iosevka-bin-${version}";
@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
''; '';
sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl"; sha256 = "11966fvqamlg88vlgs47fl3ambi48h0mjj4a758i5y8myb2hk6bd";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://be5invis.github.io/Iosevka/"; homepage = "https://be5invis.github.io/Iosevka/";

View File

@ -30,13 +30,13 @@ assert (privateBuildPlan != null) -> set != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = if set != null then "iosevka-${set}" else "iosevka"; pname = if set != null then "iosevka-${set}" else "iosevka";
version = "2.3.3"; version = "3.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "be5invis"; owner = "be5invis";
repo = "Iosevka"; repo = "Iosevka";
rev = "v${version}"; rev = "v${version}";
sha256 = "0k7xij473g5g0lwhb6qpn70v3n2d025dww3nlb7jwbpnp03zliz0"; sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
npm run build --no-update-notifier -- ttf::$pname >/dev/null npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES ttf::$pname >/dev/null
runHook postBuild runHook postBuild
''; '';

View File

@ -1,26 +1,28 @@
{ {
"name": "iosevka-build-deps", "name": "iosevka-build-deps",
"version": "2.3.3", "version": "3.2.2",
"scripts": { "scripts": {
"build": "verda -f verdafile.js" "build": "verda -f verdafile.js"
}, },
"dependencies": { "dependencies": {
"caryll-shapeops": "^0.3.1", "@iarna/toml": "^2.2.5",
"colors": "^1.3.3", "cldr": "^5.5.4",
"libspiro-js": "^0.3.1", "ejs": "^3.1.3",
"megaminx": "^0.9.0", "fs-extra": "^9.0.0",
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"otfcc-ttcize": "^0.8.0", "otfcc-ttcize": "^0.10.2",
"patel": "^0.33.1", "patel": "^0.33.1",
"patrisika-scopes": "^0.11.1", "prettier": "^2.0.5",
"primitive-quadify-off-curves": "^0.4.0", "semver": "^7.1.3",
"stylus": "^0.54.5", "spiro": "^2.0.0",
"toml": "^3.0.0", "stylus": "^0.54.7",
"topsort": "0.0.2", "topsort": "^0.0.2",
"ttf2woff": "^2.0.1", "ttf2woff": "^2.0.1",
"ttf2woff2": "^2.0.3", "ttf2woff2": "^3.0.0",
"typo-geom": "^0.8.0",
"unicode-13.0.0": "^0.8.0",
"unorm": "^1.6.0", "unorm": "^1.6.0",
"verda": "^1.0.0-0", "verda": "^1.0.1",
"yargs": "^14.2.0" "which": "^2.0.2"
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -18256,10 +18256,7 @@ in
inriafonts = callPackage ../data/fonts/inriafonts { }; inriafonts = callPackage ../data/fonts/inriafonts { };
iosevka = callPackage ../data/fonts/iosevka {};
iosevka = callPackage ../data/fonts/iosevka {
nodejs = nodejs-10_x;
};
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {}; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};
ipafont = callPackage ../data/fonts/ipafont {}; ipafont = callPackage ../data/fonts/ipafont {};