diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 00:05:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 00:05:27 +0000 |
| commit | 015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52 (patch) | |
| tree | 20bb8c5ba39bdb13cf39cfc3b6e048fa2ed0f8a4 /pkgs/data | |
| parent | 2597ed803aef52f39c4a16a188a3708bd3d2883b (diff) | |
| parent | 06607de5331dbe957cd626b8912f4d7ecef04fa8 (diff) | |
| download | nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.gz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.bz2 nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.lz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.xz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.zst nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/charis-sil/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/fonts/terminus-font-ttf/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/fedora-backgrounds/generic.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 44b40c72b58..6639cb57d8b 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; + sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index f9d25a0128e..1a65798891f 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "4.47.0"; + version = "4.49.1"; in fetchzip { name = "terminus-font-ttf-${version}"; @@ -18,7 +18,7 @@ in fetchzip { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; - sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z"; + sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; meta = with lib; { description = "A clean fixed width TTF font"; diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index 3e2e0928c3b..5ebc6ff367e 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation { description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } |