JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iosevka: 2.3.0 -> 2.3.2

Browse Source 
This commit include:
- update iosevka version
- fix extraParameters, was not able to inject all needed settings
- format file
- update package.json
This commit is contained in:
Bastien Riviere 2019-10-26 22:26:01 +02:00
parent 4c0afa1770
commit a9e88bb2e9
4 changed files with 4164 additions and 4521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/data/fonts/iosevka/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, pkgs, fetchFromGitHub { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc , ttfautohint-nox, otfcc
# Custom font set options. # Custom font set options.
# See https://github.com/be5invis/Iosevka#build-your-own-style # See https://github.com/be5invis/Iosevka#build-your-own-style
@ -13,27 +13,30 @@
# ]; # ];
# }; # };
, privateBuildPlan ? null , privateBuildPlan ? null
# Extra parameters. Can be used for ligature mapping. # Extra parameters. Can be used for ligature mapping.
# It must be a raw toml string.
#
# Ex:
# [[iosevka.compLig]]
# unicode = 57808 # 0xe1d0
# featureTag = 'XHS0'
# sequence = "+>"
, extraParameters ? null , extraParameters ? null
# Custom font set name. Required if any custom settings above. # Custom font set name. Required if any custom settings above.
, set ? null , set ? null }:
}:
assert (privateBuildPlan != null) -> set != null; assert (privateBuildPlan != null) -> set != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = pname = if set != null then "iosevka-${set}" else "iosevka";
if set != null
then "iosevka-${set}"
else "iosevka";
version = "2.3.0"; version = "2.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "be5invis"; owner = "be5invis";
repo = "Iosevka"; repo = "Iosevka";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv"; sha256 = "0s0vdvp1sn8p2pi2xm9n05pabk30ki7wjlmr0zz0nkhidb8apw6k";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,9 +47,10 @@ stdenv.mkDerivation rec {
ttfautohint-nox ttfautohint-nox
]; ];
privateBuildPlanJSON = builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; privateBuildPlanJSON =
extraParametersJSON = builtins.toJSON { ${pname} = extraParameters; }; builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
passAsFile = [ "privateBuildPlanJSON" "extraParametersJSON" ]; inherit extraParameters;
passAsFile = [ "privateBuildPlanJSON" "extraParameters" ];
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
@ -55,9 +59,11 @@ stdenv.mkDerivation rec {
''} ''}
${lib.optionalString (extraParameters != null) '' ${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> parameters.toml echo -e "\n" >> parameters.toml
remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml cat "$extraParametersPath" >> parameters.toml
''} ''}
ln -s ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/node_modules . ln -s ${
nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
}/lib/node_modules/iosevka-build-deps/node_modules .
runHook postConfigure runHook postConfigure
''; '';
@ -76,8 +82,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka; homepage = "https://be5invis.github.io/Iosevka";
downloadPage = https://github.com/be5invis/Iosevka/releases; downloadPage = "https://github.com/be5invis/Iosevka/releases";
description = '' description = ''
Slender monospace sans-serif and slab-serif typeface inspired by Pragmata Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.

2
pkgs/data/fonts/iosevka/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "iosevka-build-deps", "name": "iosevka-build-deps",
"version": "2.3.0", "version": "2.3.2",
"scripts": { "scripts": {
"build": "verda -f verdafile.js" "build": "verda -f verdafile.js"
}, },

8547
pkgs/development/node-packages/node-packages-v10.nix
View File

File diff suppressed because it is too large Load Diff

80
pkgs/development/node-packages/node-packages-v12.nix
View File

@ -256,13 +256,13 @@ let
sha1 = "1b681c21ff84033c826543090689420d187151dc"; sha1 = "1b681c21ff84033c826543090689420d187151dc";
}; };
}; };
"chownr-1.1.2" = { "chownr-1.1.3" = {
name = "chownr"; name = "chownr";
packageName = "chownr"; packageName = "chownr";
version = "1.1.2"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz"; url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
sha512 = "GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="; sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
}; };
}; };
"class-utils-0.3.6" = { "class-utils-0.3.6" = {
@ -697,13 +697,13 @@ let
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
}; };
}; };
"glob-7.1.4" = { "glob-7.1.5" = {
name = "glob"; name = "glob";
packageName = "glob"; packageName = "glob";
version = "7.1.4"; version = "7.1.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
}; };
}; };
"global-modules-1.0.0" = { "global-modules-1.0.0" = {
@ -724,13 +724,13 @@ let
sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
}; };
}; };
"graceful-fs-4.2.2" = { "graceful-fs-4.2.3" = {
name = "graceful-fs"; name = "graceful-fs";
packageName = "graceful-fs"; packageName = "graceful-fs";
version = "4.2.2"; version = "4.2.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
}; };
}; };
"grunt-known-options-1.1.1" = { "grunt-known-options-1.1.1" = {
@ -814,13 +814,13 @@ let
sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
}; };
}; };
"hosted-git-info-2.8.4" = { "hosted-git-info-2.8.5" = {
name = "hosted-git-info"; name = "hosted-git-info";
packageName = "hosted-git-info"; packageName = "hosted-git-info";
version = "2.8.4"; version = "2.8.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
}; };
}; };
"http-signature-1.2.0" = { "http-signature-1.2.0" = {
@ -1255,22 +1255,22 @@ let
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
}; };
}; };
"minipass-2.8.1" = { "minipass-2.9.0" = {
name = "minipass"; name = "minipass";
packageName = "minipass"; packageName = "minipass";
version = "2.8.1"; version = "2.9.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz"; url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg=="; sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
}; };
}; };
"minizlib-1.2.2" = { "minizlib-1.3.3" = {
name = "minizlib"; name = "minizlib";
packageName = "minizlib"; packageName = "minizlib";
version = "1.2.2"; version = "1.3.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.2.tgz"; url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
sha512 = "hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ=="; sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
}; };
}; };
"mixin-deep-1.3.2" = { "mixin-deep-1.3.2" = {
@ -2038,13 +2038,13 @@ let
sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
}; };
}; };
"tar-4.4.11" = { "tar-4.4.13" = {
name = "tar"; name = "tar";
packageName = "tar"; packageName = "tar";
version = "4.4.11"; version = "4.4.13";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz"; url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA=="; sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
}; };
}; };
"temp-0.9.0" = { "temp-0.9.0" = {
@ -2272,13 +2272,13 @@ let
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
}; };
}; };
"yallist-3.0.3" = { "yallist-3.1.1" = {
name = "yallist"; name = "yallist";
packageName = "yallist"; packageName = "yallist";
version = "3.0.3"; version = "3.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
}; };
}; };
}; };
@ -2616,7 +2616,7 @@ in
sources."buffer-from-1.1.1" sources."buffer-from-1.1.1"
sources."builtins-1.0.3" sources."builtins-1.0.3"
sources."caseless-0.12.0" sources."caseless-0.12.0"
sources."chownr-1.1.2" sources."chownr-1.1.3"
sources."code-point-at-1.1.0" sources."code-point-at-1.1.0"
sources."combined-stream-1.0.8" sources."combined-stream-1.0.8"
sources."concat-map-0.0.1" sources."concat-map-0.0.1"
@ -2651,12 +2651,12 @@ in
sources."fs.realpath-1.0.0" sources."fs.realpath-1.0.0"
sources."gauge-2.7.4" sources."gauge-2.7.4"
sources."getpass-0.1.7" sources."getpass-0.1.7"
sources."glob-7.1.4" sources."glob-7.1.5"
sources."graceful-fs-4.2.2" sources."graceful-fs-4.2.3"
sources."har-schema-2.0.0" sources."har-schema-2.0.0"
sources."har-validator-5.1.3" sources."har-validator-5.1.3"
sources."has-unicode-2.0.1" sources."has-unicode-2.0.1"
sources."hosted-git-info-2.8.4" sources."hosted-git-info-2.8.5"
sources."http-signature-1.2.0" sources."http-signature-1.2.0"
sources."inflight-1.0.6" sources."inflight-1.0.6"
sources."inherits-2.0.4" sources."inherits-2.0.4"
@ -2675,8 +2675,8 @@ in
sources."mime-types-2.1.24" sources."mime-types-2.1.24"
sources."minimatch-3.0.4" sources."minimatch-3.0.4"
sources."minimist-0.0.8" sources."minimist-0.0.8"
sources."minipass-2.8.1" sources."minipass-2.9.0"
sources."minizlib-1.2.2" sources."minizlib-1.3.3"
sources."mkdirp-0.5.1" sources."mkdirp-0.5.1"
sources."ncp-0.4.2" sources."ncp-0.4.2"
sources."nijs-0.0.25" sources."nijs-0.0.25"
@ -2748,7 +2748,7 @@ in
]; ];
}) })
sources."strip-ansi-3.0.1" sources."strip-ansi-3.0.1"
sources."tar-4.4.11" sources."tar-4.4.13"
sources."temp-0.9.0" sources."temp-0.9.0"
(sources."tough-cookie-2.4.3" // { (sources."tough-cookie-2.4.3" // {
dependencies = [ dependencies = [
@ -2768,7 +2768,7 @@ in
sources."walk-2.3.14" sources."walk-2.3.14"
sources."wide-align-1.1.3" sources."wide-align-1.1.3"
sources."wrappy-1.0.2" sources."wrappy-1.0.2"
sources."yallist-3.0.3" sources."yallist-3.1.1"
]; ];
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {