From c7b781ca129befdda451590b291c1761402b8645 Mon Sep 17 00:00:00 2001 From: PkmX Date: Sun, 9 Feb 2014 05:20:21 +0800 Subject: [PATCH 1/6] Bump wqy-zenhei to 0.9.45. --- pkgs/data/fonts/wqy-zenhei/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 960c74f68413..993e584a7d42 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wqy-zenhei-0.4.23-1"; + name = "wqy-zenhei-${version}"; + version = "0.9.45"; src = fetchurl { - url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz; - sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm"; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; + sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"; }; + dontBuild = true; + installPhase = '' mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts + install -m644 *.ttc $out/share/fonts/ ''; meta = { From 023f30f07d927976060e5b0a7eec0699340b3ce2 Mon Sep 17 00:00:00 2001 From: PkmX Date: Sat, 8 Feb 2014 22:37:40 +0800 Subject: [PATCH 2/6] Add wqy-microhei font --- pkgs/data/fonts/wqy-microhei/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/data/fonts/wqy-microhei/default.nix diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix new file mode 100644 index 000000000000..fb3bbabf8471 --- /dev/null +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wqy-microhei-0.2.0-beta"; + + src = fetchurl { + url = "mirror://sourceforge/wqy/${name}.tar.gz"; + sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"; + }; + + installPhase = + '' + install -Dm644 wqy-microhei.ttc $out/share/fonts + ''; + + meta = { + description = "A (mainly) Chinese Unicode font"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a51d1d33f566..5fa44337c738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7344,6 +7344,8 @@ let vistafonts = callPackage ../data/fonts/vista-fonts { }; + wqy_microhei = callPackage ../data/fonts/wqy-microhei { }; + wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; From ce28f1bb72c1d9942504e4b4d2a6ffcb2b7ecde1 Mon Sep 17 00:00:00 2001 From: PkmX Date: Sun, 9 Feb 2014 06:10:40 +0800 Subject: [PATCH 3/6] Minor fix to wqy-microhei.ttc path. --- pkgs/data/fonts/wqy-microhei/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index fb3bbabf8471..97638cb008c0 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { installPhase = '' - install -Dm644 wqy-microhei.ttc $out/share/fonts + install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc ''; meta = { From 5181713002e2920684fa46f70020102af8a0aa20 Mon Sep 17 00:00:00 2001 From: PkmX Date: Wed, 12 Feb 2014 11:24:06 +0800 Subject: [PATCH 4/6] Add myself to maintainers and metadata to wqy-*. --- lib/maintainers.nix | 1 + pkgs/data/fonts/wqy-microhei/default.nix | 3 +++ pkgs/data/fonts/wqy-zenhei/default.nix | 3 +++ 3 files changed, 7 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fa0d1d81e611..8b53c8ae7387 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -49,6 +49,7 @@ phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; + pkmx = "Chih-Mao Chen "; pSub = "Pascal Wittmann "; qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index 97638cb008c0..1d3b3e6d82d4 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; + homepage = "http://wenq.org"; + license = "gplv2"; # with font embedding exceptions + maintainers = stdenv.lib.maintainers.pkmx; }; } diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 993e584a7d42..e317b863db3a 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; + homepage = "http://wenq.org"; + license = "gplv2"; # with font embedding exceptions + maintainers = stdenv.lib.maintainers.pkmx; }; } From 0ce54a4768f92636c91bedd1c5197b7b1a75b8a8 Mon Sep 17 00:00:00 2001 From: PkmX Date: Wed, 12 Feb 2014 11:27:02 +0800 Subject: [PATCH 5/6] wqy-microhei: squash installPhase into one line. --- pkgs/data/fonts/wqy-microhei/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index 1d3b3e6d82d4..506dd895d6a6 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -8,10 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"; }; - installPhase = - '' - install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc - ''; + installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc''; meta = { description = "A (mainly) Chinese Unicode font"; From eb295a62f21203e520f0017737b6288758c6c925 Mon Sep 17 00:00:00 2001 From: PkmX Date: Thu, 13 Feb 2014 03:38:21 +0800 Subject: [PATCH 6/6] Fix licenses and add platforms metadata for wqy-*. --- pkgs/data/fonts/wqy-microhei/default.nix | 3 ++- pkgs/data/fonts/wqy-zenhei/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index 506dd895d6a6..065bb4bc828f 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; homepage = "http://wenq.org"; - license = "gplv2"; # with font embedding exceptions + license = stdenv.lib.licenses.asl20; maintainers = stdenv.lib.maintainers.pkmx; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index e317b863db3a..d42665c69cca 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "A (mainly) Chinese Unicode font"; homepage = "http://wenq.org"; - license = "gplv2"; # with font embedding exceptions + license = stdenv.lib.licenses.gpl2; # with font embedding exceptions maintainers = stdenv.lib.maintainers.pkmx; + platforms = stdenv.lib.platforms.all; }; }