Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-01-01 12:25:55 +00:00
committed by GitHub
14 changed files with 122 additions and 366 deletions

View File

@@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
pname = "unifont";
version = "13.0.04";
version = "13.0.05";
ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE=";
sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf";
};
pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18=";
sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r";
};
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];

View File

@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "13.0.04";
version = "13.0.05";
in fetchzip rec {
name = "unifont_upper-${version}";
@@ -9,7 +9,7 @@ in fetchzip rec {
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f";
sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp";
meta = with lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";