diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-16 00:12:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 00:12:35 +0000 |
| commit | 4bcc666196ecc00f99da5823acbf348f43498386 (patch) | |
| tree | b2ea937cf539a83e7e8f2b09c038b3e50c29488a /pkgs/data | |
| parent | 0bab14394cfc0625329ae86958aeca63db0c5073 (diff) | |
| parent | d3f9ba06c2bbab3a10d4c74662734375941bf32b (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/unifont/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/unifont_upper/default.nix | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 808d96ce446d2..b8a7809646618 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "14.0.03"; + version = "14.0.04"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "1qyc7nqyhjnarwgpkah52qv7hr0yfzak7084ilrj7z0nii4f5y57"; + hash = "sha256-IR0d3dxWZRHbJUx0bYPfd7ShubJUnN/+Cj6QHkbu/qg="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "1sgvxpr4ydjnbk70j0lpgxz5x851lmrmxjb5x8lsz0i2hm32jdbc"; + hash = "sha256-Q5lR7hX4+P+Q9fVDjw9GtLGqUIslsKOWnn8je85fH+0="; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 84a1742b8439f..1020c2f1f1327 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,15 +1,19 @@ -{ lib, fetchzip }: +{ lib, fetchurl }: let - version = "14.0.03"; -in fetchzip rec { + version = "14.0.04"; +in fetchurl rec { name = "unifont_upper-${version}"; url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf"; + downloadToTemp = true; + + recursiveHash = true; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1lwx7syb9ij4dlqiiybp6xgvar2sszxphvaqh64vivzj9gp0g0ai"; + hash = "sha256-cNw+3Y/6h2TD6ZSaGO32NNyiTwCUSJsA3Q5W5/m+eLE="; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; |