diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:49:10 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:49:10 +0100 |
commit | 8aaf2e60e54409dfa06011077991d20600365386 (patch) | |
tree | 1ad3e485bec393e4295d23a890492850d5c92e73 /pkgs/data | |
parent | b5ca1a173104157e32798a9a7a3b13924e745ab0 (diff) | |
parent | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/ttf-tw-moe/default.nix | 27 | ||||
-rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 1 |
3 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix new file mode 100644 index 0000000000000..aeda5cd695d64 --- /dev/null +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip { + name = "ttf-tw-moe"; + + url = "https://github.com/Jiehong/TW-fonts/archive/b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile TW-fonts-b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f/\*.ttf -d $out/share/fonts/truetype + ''; + + sha256 = "0khgxih9z6pqf7pdp21xjp24wb9ygsrdcmzpjb7vr9x8n78i1fbs"; + + meta = with stdenv.lib; { + homepage = "http://www.moe.gov.tw/"; + description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; + longDescription = '' + Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai. + Both are provided by the Ministry of Education of Taiwan; each character's shape + closely follows the official recommendation, and can be used as for teaching purposes. + ''; + license = licenses.cc-by-nd-30; + maintainers = [ maintainers.jiehong ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c9950d9fcd11e..3c9a531ab62fd 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; - sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; + sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index dc80580ff5ecf..5065e3718cb26 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" + "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" "cc=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ]; |