iosevka: 1.13.3 -> 1.14.0
This commit is contained in:
parent
d668e8ee4b
commit
a83d7a1b79
@ -7,6 +7,7 @@
|
|||||||
# 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
|
||||||
design ? [], upright ? [], italic ? [], oblique ? [],
|
design ? [], upright ? [], italic ? [], oblique ? [],
|
||||||
|
family ? null, weights ? [],
|
||||||
# Custom font set name. Required if any custom settings above.
|
# Custom font set name. Required if any custom settings above.
|
||||||
set ? null
|
set ? null
|
||||||
}:
|
}:
|
||||||
@ -15,6 +16,8 @@ assert (design != []) -> set != null;
|
|||||||
assert (upright != []) -> set != null;
|
assert (upright != []) -> set != null;
|
||||||
assert (italic != []) -> set != null;
|
assert (italic != []) -> set != null;
|
||||||
assert (oblique != []) -> set != null;
|
assert (oblique != []) -> set != null;
|
||||||
|
assert (family != null) -> set != null;
|
||||||
|
assert (weights != []) -> set != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
installPackageLock = import ./package-lock.nix { inherit fetchurl lib; };
|
installPackageLock = import ./package-lock.nix { inherit fetchurl lib; };
|
||||||
@ -23,13 +26,13 @@ in
|
|||||||
let pname = if set != null then "iosevka-${set}" else "iosevka"; in
|
let pname = if set != null then "iosevka-${set}" else "iosevka"; in
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.13.3";
|
version = "1.14.0";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "be5invis";
|
owner = "be5invis";
|
||||||
repo ="Iosevka";
|
repo ="Iosevka";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0wfhfiahllq8ngn0mybvp29cfcm7b8ndk3fyhizd620wrj50bazf";
|
sha256 = "0mmdlrd9a0rhmmdqwkk6v7cdvbi23djr5kkiyv38llk11j3w0clp";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -44,8 +47,11 @@ let
|
|||||||
(param "upright" upright)
|
(param "upright" upright)
|
||||||
(param "italic" italic)
|
(param "italic" italic)
|
||||||
(param "oblique" oblique)
|
(param "oblique" oblique)
|
||||||
|
(if family != null then "family='${family}'" else null)
|
||||||
|
(param "weights" weights)
|
||||||
]);
|
]);
|
||||||
custom = design != [] || upright != [] || italic != [] || oblique != [];
|
custom = design != [] || upright != [] || italic != [] || oblique != []
|
||||||
|
|| family != null || weights != [];
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
64
pkgs/data/fonts/iosevka/package-lock.json
generated
64
pkgs/data/fonts/iosevka/package-lock.json
generated
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "iosevka",
|
"name": "iosevka",
|
||||||
"version": "1.13.3",
|
"version": "1.14.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"JSONStream": {
|
"JSONStream": {
|
||||||
"version": "1.3.1",
|
"version": "1.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
|
||||||
"integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
|
"integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
|
||||||
"requires": {
|
"requires": {
|
||||||
"jsonparse": "1.3.1",
|
"jsonparse": "1.3.1",
|
||||||
"through": "2.3.8"
|
"through": "2.3.8"
|
||||||
@ -24,9 +24,9 @@
|
|||||||
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
|
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
|
||||||
},
|
},
|
||||||
"bezier-js": {
|
"bezier-js": {
|
||||||
"version": "2.2.3",
|
"version": "2.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz",
|
||||||
"integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU="
|
"integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg=="
|
||||||
},
|
},
|
||||||
"builtin-modules": {
|
"builtin-modules": {
|
||||||
"version": "1.1.1",
|
"version": "1.1.1",
|
||||||
@ -39,11 +39,11 @@
|
|||||||
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
|
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
|
||||||
},
|
},
|
||||||
"caryll-shapeops": {
|
"caryll-shapeops": {
|
||||||
"version": "0.2.1",
|
"version": "0.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz",
|
||||||
"integrity": "sha1-uEBMpQ5pAMB6vJNXubsAhbQEa8s=",
|
"integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"bezier-js": "2.2.3",
|
"bezier-js": "2.2.5",
|
||||||
"clipper-lib": "1.0.0"
|
"clipper-lib": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -54,7 +54,7 @@
|
|||||||
"requires": {
|
"requires": {
|
||||||
"cross-spawn": "4.0.2",
|
"cross-spawn": "4.0.2",
|
||||||
"node-version": "1.1.0",
|
"node-version": "1.1.0",
|
||||||
"promise-polyfill": "6.0.2"
|
"promise-polyfill": "6.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"clipper-lib": {
|
"clipper-lib": {
|
||||||
@ -457,7 +457,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz",
|
||||||
"integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
|
"integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"JSONStream": "1.3.1",
|
"JSONStream": "1.3.2",
|
||||||
"child-process-promise": "2.2.1",
|
"child-process-promise": "2.2.1",
|
||||||
"cubic2quad": "1.1.1",
|
"cubic2quad": "1.1.1",
|
||||||
"fs-extra": "3.0.1",
|
"fs-extra": "3.0.1",
|
||||||
@ -469,13 +469,13 @@
|
|||||||
"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
|
||||||
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
|
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
|
||||||
"requires": {
|
"requires": {
|
||||||
"mimic-fn": "1.1.0"
|
"mimic-fn": "1.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mimic-fn": {
|
"mimic-fn": {
|
||||||
"version": "1.1.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
|
||||||
"integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg="
|
"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
|
||||||
},
|
},
|
||||||
"node-version": {
|
"node-version": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
@ -489,7 +489,7 @@
|
|||||||
"requires": {
|
"requires": {
|
||||||
"hosted-git-info": "2.5.0",
|
"hosted-git-info": "2.5.0",
|
||||||
"is-builtin-module": "1.0.0",
|
"is-builtin-module": "1.0.0",
|
||||||
"semver": "5.4.1",
|
"semver": "5.5.0",
|
||||||
"validate-npm-package-license": "3.0.1"
|
"validate-npm-package-license": "3.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -538,18 +538,26 @@
|
|||||||
"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
|
"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
|
||||||
},
|
},
|
||||||
"p-limit": {
|
"p-limit": {
|
||||||
"version": "1.1.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
|
||||||
"integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw="
|
"integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
|
||||||
|
"requires": {
|
||||||
|
"p-try": "1.0.0"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"p-locate": {
|
"p-locate": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
|
||||||
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
|
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
|
||||||
"requires": {
|
"requires": {
|
||||||
"p-limit": "1.1.0"
|
"p-limit": "1.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"p-try": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
|
||||||
|
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
|
||||||
|
},
|
||||||
"pad": {
|
"pad": {
|
||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz",
|
||||||
@ -661,9 +669,9 @@
|
|||||||
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
|
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
|
||||||
},
|
},
|
||||||
"promise-polyfill": {
|
"promise-polyfill": {
|
||||||
"version": "6.0.2",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz",
|
||||||
"integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
|
"integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc="
|
||||||
},
|
},
|
||||||
"pseudomap": {
|
"pseudomap": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
@ -708,9 +716,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"semver": {
|
"semver": {
|
||||||
"version": "5.4.1",
|
"version": "5.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
|
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
|
||||||
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
|
"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
|
||||||
},
|
},
|
||||||
"set-blocking": {
|
"set-blocking": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user