From a83d7a1b79182d0b35c0f06ab051be7606ff45a3 Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 12 Feb 2018 10:48:36 +0200 Subject: iosevka: 1.13.3 -> 1.14.0 --- pkgs/data/fonts/iosevka/default.nix | 12 ++++-- pkgs/data/fonts/iosevka/package-lock.json | 64 +++++++++++++++++-------------- 2 files changed, 45 insertions(+), 31 deletions(-) (limited to 'pkgs/data/fonts/iosevka') diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index bf36d23e5c2..7c1676ed8b6 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -7,6 +7,7 @@ # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style design ? [], upright ? [], italic ? [], oblique ? [], + family ? null, weights ? [], # Custom font set name. Required if any custom settings above. set ? null }: @@ -15,6 +16,8 @@ assert (design != []) -> set != null; assert (upright != []) -> set != null; assert (italic != []) -> set != null; assert (oblique != []) -> set != null; +assert (family != null) -> set != null; +assert (weights != []) -> set != null; let 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 - version = "1.13.3"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; rev = "v${version}"; - sha256 = "0wfhfiahllq8ngn0mybvp29cfcm7b8ndk3fyhizd620wrj50bazf"; + sha256 = "0mmdlrd9a0rhmmdqwkk6v7cdvbi23djr5kkiyv38llk11j3w0clp"; }; in @@ -44,8 +47,11 @@ let (param "upright" upright) (param "italic" italic) (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 stdenv.mkDerivation { diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json index 4e8a9be8807..54de11a1f42 100644 --- a/pkgs/data/fonts/iosevka/package-lock.json +++ b/pkgs/data/fonts/iosevka/package-lock.json @@ -1,13 +1,13 @@ { "name": "iosevka", - "version": "1.13.3", + "version": "1.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { "JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", - "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", + "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", "requires": { "jsonparse": "1.3.1", "through": "2.3.8" @@ -24,9 +24,9 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "bezier-js": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz", - "integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU=" + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.5.tgz", + "integrity": "sha512-HGh+GevPguxrAmnWF2/A+8c8FEatnKcE6WttpYWA5fn1CfpJz4reFbr11DuyFs2gwaIo9vF7aVXW2xg1iaqvyg==" }, "builtin-modules": { "version": "1.1.1", @@ -39,11 +39,11 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "caryll-shapeops": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.2.1.tgz", - "integrity": "sha1-uEBMpQ5pAMB6vJNXubsAhbQEa8s=", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz", + "integrity": "sha512-3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==", "requires": { - "bezier-js": "2.2.3", + "bezier-js": "2.2.5", "clipper-lib": "1.0.0" } }, @@ -54,7 +54,7 @@ "requires": { "cross-spawn": "4.0.2", "node-version": "1.1.0", - "promise-polyfill": "6.0.2" + "promise-polyfill": "6.1.0" } }, "clipper-lib": { @@ -457,7 +457,7 @@ "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", "requires": { - "JSONStream": "1.3.1", + "JSONStream": "1.3.2", "child-process-promise": "2.2.1", "cubic2quad": "1.1.1", "fs-extra": "3.0.1", @@ -469,13 +469,13 @@ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==" }, "node-version": { "version": "1.1.0", @@ -489,7 +489,7 @@ "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", - "semver": "5.4.1", + "semver": "5.5.0", "validate-npm-package-license": "3.0.1" } }, @@ -538,18 +538,26 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "requires": { + "p-try": "1.0.0" + } }, "p-locate": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "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": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", @@ -661,9 +669,9 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "promise-polyfill": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz", - "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" }, "pseudomap": { "version": "1.0.2", @@ -708,9 +716,9 @@ } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, "set-blocking": { "version": "2.0.0", -- cgit 1.4.1