From cf21858bdfd4735ba0a4d2f32bcf187ab4c16f78 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Wed, 4 Jun 2014 00:54:01 -0600 Subject: Added package for kochi-substitute font. --- pkgs/data/fonts/kochi-substitute/default.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/data/fonts/kochi-substitute/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix new file mode 100644 index 000000000000..f00f855d4909 --- /dev/null +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +let version = "20030809"; +in +stdenv.mkDerivation { + name = "kochi-substitute-${version}"; + + src = fetchurl { + url = "http://jaist.dl.sourceforge.jp/efont/5411/kochi-substitute-${version}.tar.bz2"; + sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; + }; + + sourceRoot = "kochi-substitute-${version}"; + + installPhase = + '' + mkdir -p $out/share/fonts/kochi-substitute + cp *.ttf $out/share/fonts/kochi-substitute + ''; + + meta = { + description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; + homepage = http://sourceforge.jp/projects/efont/; + }; +} -- cgit 1.4.1 From 0672cfcc5f8bf556905555e111e184bb6df28e7b Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sun, 8 Jun 2014 11:47:37 -0600 Subject: Added mirrors for sourceforge.jp. --- pkgs/build-support/fetchurl/mirrors.nix | 6 ++++++ pkgs/data/fonts/kochi-substitute/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/data') diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index eb3b8a105cdb..9a0ced7437b2 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -20,6 +20,12 @@ rec { http://kent.dl.sourceforge.net/sourceforge/ ]; + # SourceForge.jp. + sourceforgejp = [ + http://osdn.dl.sourceforge.jp/ + http://jaist.dl.sourceforge.jp/ + ]; + # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index f00f855d4909..625955c444db 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "kochi-substitute-${version}"; src = fetchurl { - url = "http://jaist.dl.sourceforge.jp/efont/5411/kochi-substitute-${version}.tar.bz2"; + url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; }; -- cgit 1.4.1 From b913409e0bcf93706f2e2f6b25809ab30bd124ec Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Wed, 11 Jun 2014 22:05:16 -0600 Subject: Removed non-free kochi-substitute and added kochi from Debian package. --- lib/licenses.nix | 6 +++++ lib/maintainers.nix | 1 + pkgs/data/fonts/kochi-gothic/default.nix | 35 ++++++++++++++++++++++++++++ pkgs/data/fonts/kochi-mincho/default.nix | 35 ++++++++++++++++++++++++++++ pkgs/data/fonts/kochi-substitute/default.nix | 25 -------------------- pkgs/top-level/all-packages.nix | 4 +++- 6 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 pkgs/data/fonts/kochi-gothic/default.nix create mode 100644 pkgs/data/fonts/kochi-mincho/default.nix delete mode 100644 pkgs/data/fonts/kochi-substitute/default.nix (limited to 'pkgs/data') diff --git a/lib/licenses.nix b/lib/licenses.nix index e49528f2a2e6..171f69389371 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -243,6 +243,12 @@ unfreeRedistributableFirmware = "unfree-redistributable-firmware"; + wadalab = { + shortName = "wadalab"; + fullName = "Wadalab Font License"; + url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; + }; + zlib = { shortName = "zlib"; fullName = "zlib license"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8a98cb146513..a0aae2f3b592 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -17,6 +17,7 @@ arobyn = "Alexei Robyn "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; + auntie = "Jonathan Glines "; bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; diff --git a/pkgs/data/fonts/kochi-gothic/default.nix b/pkgs/data/fonts/kochi-gothic/default.nix new file mode 100644 index 000000000000..9c36da36bf6e --- /dev/null +++ b/pkgs/data/fonts/kochi-gothic/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, dpkg }: + +let version = "20030809"; +in +stdenv.mkDerivation { + name = "kochi-gothic-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; + sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea"; + }; + + buildInputs = [ dpkg ]; + + unpackCmd = '' + dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/ + ''; + + meta = { + description = "Japanese font, a free replacement for MS Gothic."; + longDescription = '' + Kochi Gothic was developed as a free replacement for the MS Gothic + font from Microsoft. This is the Debian version of Kochi Gothic, which + removes some non-free glyphs that were added from the naga10 font. + ''; + homepage = http://sourceforge.jp/projects/efont/; + license = stdenv.lib.licenses.wadalab; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/data/fonts/kochi-mincho/default.nix b/pkgs/data/fonts/kochi-mincho/default.nix new file mode 100644 index 000000000000..2f31b85220b9 --- /dev/null +++ b/pkgs/data/fonts/kochi-mincho/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, dpkg }: + +let version = "20030809"; +in +stdenv.mkDerivation { + name = "kochi-mincho-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb"; + sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c"; + }; + + buildInputs = [ dpkg ]; + + unpackCmd = '' + dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ + ''; + + meta = { + description = "Japanese font, a free replacement for MS Mincho."; + longDescription = '' + Kochi Mincho was developed as a free replacement for the MS Mincho + font from Microsoft. This is the Debian version of Kochi Mincho, which + removes some non-free glyphs that were added from the naga10 font. + ''; + homepage = http://sourceforge.jp/projects/efont/; + license = stdenv.lib.licenses.wadalab; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix deleted file mode 100644 index 625955c444db..000000000000 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl }: - -let version = "20030809"; -in -stdenv.mkDerivation { - name = "kochi-substitute-${version}"; - - src = fetchurl { - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; - }; - - sourceRoot = "kochi-substitute-${version}"; - - installPhase = - '' - mkdir -p $out/share/fonts/kochi-substitute - cp *.ttf $out/share/fonts/kochi-substitute - ''; - - meta = { - description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; - homepage = http://sourceforge.jp/projects/efont/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3be9de80fc1a..b6aaa84f6191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7789,7 +7789,9 @@ let junicode = callPackage ../data/fonts/junicode { }; - kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; + kochi-gothic = callPackage ../data/fonts/kochi-gothic {}; + + kochi-mincho = callPackage ../data/fonts/kochi-mincho {}; liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; -- cgit 1.4.1 From f5b5df830cdf506cca1a8a6b17cc1ea1b775d788 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Wed, 11 Jun 2014 22:18:05 -0600 Subject: Moved kochi-mincho and kochi-gothic back into one package. --- pkgs/data/fonts/kochi-gothic/default.nix | 35 ---------------------- pkgs/data/fonts/kochi-mincho/default.nix | 35 ---------------------- pkgs/data/fonts/kochi-substitute/default.nix | 43 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 44 insertions(+), 73 deletions(-) delete mode 100644 pkgs/data/fonts/kochi-gothic/default.nix delete mode 100644 pkgs/data/fonts/kochi-mincho/default.nix create mode 100644 pkgs/data/fonts/kochi-substitute/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/kochi-gothic/default.nix b/pkgs/data/fonts/kochi-gothic/default.nix deleted file mode 100644 index 9c36da36bf6e..000000000000 --- a/pkgs/data/fonts/kochi-gothic/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, dpkg }: - -let version = "20030809"; -in -stdenv.mkDerivation { - name = "kochi-gothic-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; - sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea"; - }; - - buildInputs = [ dpkg ]; - - unpackCmd = '' - dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf - ''; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/ - ''; - - meta = { - description = "Japanese font, a free replacement for MS Gothic."; - longDescription = '' - Kochi Gothic was developed as a free replacement for the MS Gothic - font from Microsoft. This is the Debian version of Kochi Gothic, which - removes some non-free glyphs that were added from the naga10 font. - ''; - homepage = http://sourceforge.jp/projects/efont/; - license = stdenv.lib.licenses.wadalab; - maintainers = [ stdenv.lib.maintainers.auntie ]; - }; -} diff --git a/pkgs/data/fonts/kochi-mincho/default.nix b/pkgs/data/fonts/kochi-mincho/default.nix deleted file mode 100644 index 2f31b85220b9..000000000000 --- a/pkgs/data/fonts/kochi-mincho/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, dpkg }: - -let version = "20030809"; -in -stdenv.mkDerivation { - name = "kochi-mincho-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb"; - sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c"; - }; - - buildInputs = [ dpkg ]; - - unpackCmd = '' - dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf - ''; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ - ''; - - meta = { - description = "Japanese font, a free replacement for MS Mincho."; - longDescription = '' - Kochi Mincho was developed as a free replacement for the MS Mincho - font from Microsoft. This is the Debian version of Kochi Mincho, which - removes some non-free glyphs that were added from the naga10 font. - ''; - homepage = http://sourceforge.jp/projects/efont/; - license = stdenv.lib.licenses.wadalab; - maintainers = [ stdenv.lib.maintainers.auntie ]; - }; -} diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix new file mode 100644 index 000000000000..eceebf52912c --- /dev/null +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, dpkg }: + +let version = "20030809"; +in +stdenv.mkDerivation { + name = "kochi-substitute-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-gothic_${version}-15_all.deb"; + sha256 = "6e2311cd8e880a9328e4d3eef34a1c1f024fc87fba0dce177a0e1584a7360fea"; + }; + + src2 = fetchurl { + url = "mirror://debian/pool/main/t/ttf-kochi/ttf-kochi-mincho_${version}-15_all.deb"; + sha256 = "91ce6c993a3a0f77ed85db76f62ce18632b4c0cbd8f864676359a17ae5e6fa3c"; + }; + + buildInputs = [ dpkg ]; + + unpackCmd = '' + dpkg-deb --fsys-tarfile $src | tar xf - ./usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf + dpkg-deb --fsys-tarfile $src2 | tar xf - ./usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp ./share/fonts/truetype/kochi/kochi-gothic-subst.ttf $out/share/fonts/truetype/ + cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ + ''; + + meta = { + description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; + longDescription = '' + Kochi Gothic was developed as a free replacement for the MS Gothic and + MS Mincho fonts from Microsoft. These are the Debian versions of the + fonts, which remove some non-free glyphs that were added from the naga10 + font. + ''; + homepage = http://sourceforge.jp/projects/efont/; + license = stdenv.lib.licenses.wadalab; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6aaa84f6191..3be9de80fc1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7789,9 +7789,7 @@ let junicode = callPackage ../data/fonts/junicode { }; - kochi-gothic = callPackage ../data/fonts/kochi-gothic {}; - - kochi-mincho = callPackage ../data/fonts/kochi-mincho {}; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; -- cgit 1.4.1 From 1a30cf5e0926488b58b862a370a5e88461815c23 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Thu, 12 Jun 2014 21:33:23 -0600 Subject: Re-added the non-free kochi-substitute with naga10 glyphs. --- .../data/fonts/kochi-substitute-naga10/default.nix | 36 ++++++++++++++++++++++ pkgs/data/fonts/kochi-substitute/default.nix | 8 ++--- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 pkgs/data/fonts/kochi-substitute-naga10/default.nix (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix new file mode 100644 index 000000000000..30a56f950f9a --- /dev/null +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +let version = "20030809"; +in +stdenv.mkDerivation { + name = "kochi-substitute-naga10-${version}"; + + src = fetchurl { + url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; + sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; + }; + + sourceRoot = "kochi-substitute-${version}"; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf + cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf + ''; + + unfreeRedistributable = "unfree-redistributable"; + + meta = { + description = "Japanese font, non-free replacement for MS Gothic and MS Mincho."; + homepage = http://sourceforge.jp/projects/efont/; + longDescription = '' + Kochi Gothic and Kochi Mincho were developed as free replacements for the + MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts + includes some non-free glyphs from the naga10 font, which stipulate that + this font may not be sold commercially. See kochi-substitute for the free + Debian version. + ''; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index eceebf52912c..dec20fd51000 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { meta = { description = "Japanese font, a free replacement for MS Gothic and MS Mincho."; longDescription = '' - Kochi Gothic was developed as a free replacement for the MS Gothic and - MS Mincho fonts from Microsoft. These are the Debian versions of the - fonts, which remove some non-free glyphs that were added from the naga10 - font. + Kochi Gothic and Kochi Mincho were developed as free replacements for the + MS Gothic and MS Mincho fonts from Microsoft. These are the Debian + versions of the fonts, which remove some non-free glyphs that were added + from the naga10 font. ''; homepage = http://sourceforge.jp/projects/efont/; license = stdenv.lib.licenses.wadalab; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3be9de80fc1a..e5d81472f338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7791,6 +7791,8 @@ let kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; + kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { -- cgit 1.4.1 From fad3494f072ffb766a5b65d7ee80e3e17fce327f Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Thu, 12 Jun 2014 21:38:37 -0600 Subject: Changed kochi-substitute-naga10 to unfreeRedistributable. --- pkgs/data/fonts/kochi-substitute-naga10/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index 30a56f950f9a..98ab8a3bcac5 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -18,11 +18,8 @@ stdenv.mkDerivation { cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf ''; - unfreeRedistributable = "unfree-redistributable"; - meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho."; - homepage = http://sourceforge.jp/projects/efont/; longDescription = '' Kochi Gothic and Kochi Mincho were developed as free replacements for the MS Gothic and MS Mincho fonts from Microsoft. This version of the fonts @@ -30,7 +27,8 @@ stdenv.mkDerivation { this font may not be sold commercially. See kochi-substitute for the free Debian version. ''; - license = stdenv.lib.licenses.unfree; + homepage = http://sourceforge.jp/projects/efont/; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = [ stdenv.lib.maintainers.auntie ]; }; } -- cgit 1.4.1