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
sets = [
@ -23,25 +23,40 @@ let
sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
};
privateBuildPlan = src.outPath + "/private-build-plans.toml";
overrideAttrs = (attrs: {
inherit version;
meta = with lib; {
inherit (src.meta) homepage;
description = ''
Customised build of the Iosevka typeface, with a consistent
rounded style and overrides for almost all individual glyphs
in both roman (upright) and italic (slanted) variants.
'';
license = licenses.ofl;
platforms = attrs.meta.platforms;
maintainers = [ maintainers.DamienCassou ];
};
});
makeIosevkaFont = set:
(callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs
overrideAttrs;
in builtins.listToAttrs (builtins.map (set: {
name = set;
value = makeIosevkaFont set;
}) sets)
let superBuildNpmPackage = buildNpmPackage; in
(iosevka.override rec {
inherit set privateBuildPlan;
buildNpmPackage = args: superBuildNpmPackage
(args // {
inherit version;
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77";
hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w=";
};
npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw=";
meta = with lib; {
inherit (src.meta) homepage;
description = ''
Customised build of the Iosevka typeface, with a consistent
rounded style and overrides for almost all individual glyphs
in both roman (upright) and italic (slanted) variants.
'';
license = licenses.ofl;
platforms = iosevka.meta.platforms;
maintainers = [ maintainers.DamienCassou ];
};
});
});
in
builtins.listToAttrs (builtins.map
(set: {
name = set;
value = makeIosevkaFont set;
})
sets)