Merge pull request #217383 from lunik1/iosevka-comfy-pin-iosevka

This commit is contained in:
Damien Cassou 2023-02-24 07:49:21 +01:00 committed by GitHub
commit f03c72db1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ callPackage, lib, fetchFromSourcehut }: { lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }:
let let
sets = [ sets = [
@ -23,9 +23,23 @@ let
sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p"; sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
}; };
privateBuildPlan = src.outPath + "/private-build-plans.toml"; privateBuildPlan = src.outPath + "/private-build-plans.toml";
overrideAttrs = (attrs: { makeIosevkaFont = set:
let superBuildNpmPackage = buildNpmPackage; in
(iosevka.override rec {
inherit set privateBuildPlan;
buildNpmPackage = args: superBuildNpmPackage
(args // {
inherit version; inherit version;
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77";
hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w=";
};
npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw=";
meta = with lib; { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = '' description = ''
@ -34,14 +48,15 @@ let
in both roman (upright) and italic (slanted) variants. in both roman (upright) and italic (slanted) variants.
''; '';
license = licenses.ofl; license = licenses.ofl;
platforms = attrs.meta.platforms; platforms = iosevka.meta.platforms;
maintainers = [ maintainers.DamienCassou ]; maintainers = [ maintainers.DamienCassou ];
}; };
}); });
makeIosevkaFont = set: });
(callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs in
overrideAttrs; builtins.listToAttrs (builtins.map
in builtins.listToAttrs (builtins.map (set: { (set: {
name = set; name = set;
value = makeIosevkaFont set; value = makeIosevkaFont set;
}) sets) })
sets)