From db74af9a5f5f0b6f6c87320a12ff60129f48c58e Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 23 Sep 2015 23:44:28 +0300 Subject: fonts: Formatting, empty lines and whitespaces. --- pkgs/data/fonts/aurulent-sans/default.nix | 8 +++- pkgs/data/fonts/dejavu-fonts/default.nix | 3 ++ pkgs/data/fonts/font-awesome-ttf/default.nix | 3 -- pkgs/data/fonts/fontWrap/default.nix | 46 +++++++++++----------- pkgs/data/fonts/freefont-ttf/default.nix | 5 +-- pkgs/data/fonts/gyre/default.nix | 16 ++++---- pkgs/data/fonts/hack/default.nix | 1 - pkgs/data/fonts/mph-2b-damase/default.nix | 4 ++ pkgs/data/fonts/nafees/default.nix | 13 +++--- pkgs/data/fonts/opensans-ttf/default.nix | 3 -- pkgs/data/fonts/poly/default.nix | 16 ++++---- pkgs/data/fonts/redhat-liberation-fonts/binary.nix | 3 -- .../data/fonts/redhat-liberation-fonts/default.nix | 3 -- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 3 ++ 14 files changed, 61 insertions(+), 66 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 3685dbf356e9..f57f3de7f829 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "aurulent-sans-0.1"; + src = fetchgit { url = "https://github.com/deepfire/hartke-aurulent-sans.git"; rev = "refs/tags/${name}"; sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; }; + buildPhase = "true"; - installPhase = " + + installPhase = '' fontDir=$out/share/fonts/opentype mkdir -p $fontDir cp *.otf $fontDir - "; + ''; + meta = { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 728cb4445399..9d5e25e0abd6 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2"; sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4"; }; + buildFlags = "full-ttf"; + preBuild = '' sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/* sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/* @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { ln -s ${unicodeData} resources/UnicodeData.txt ln -s ${blocks} resources/Blocks.txt ''; + installPhase = '' mkdir -p $out/share/fonts/truetype for i in $(find build -name '*.ttf'); do diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index 992b87b8ec75..246eb3fb4814 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -16,15 +16,12 @@ stdenv.mkDerivation rec { meta = { description = "Font Awesome - TTF font"; - longDescription = '' Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the TTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; license = stdenv.lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.abaldeau ]; }; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 9a65c0cde302..e2822cf164f0 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,31 +1,31 @@ args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }: with args; - let localDefs = builderDefs.passthru.function { - src =""; /* put a fetchurl here */ - buildInputs = [mkfontdir mkfontscale]; - configureFlags = []; - }; - in with localDefs; + let localDefs = builderDefs.passthru.function { + src =""; /* put a fetchurl here */ + buildInputs = [mkfontdir mkfontscale]; + configureFlags = []; + }; + in with localDefs; let - doInstall = fullDepEntry (" - mkdir -p \$out/share/fonts/ - cd \$out/share/fonts - for i in ${toString paths}; do - find \$i -type f -exec ln -s '{}' . ';' ; - done - mkfontdir - mkfontscale - ") [minInit addInputs defEnsureDir] ; + doInstall = fullDepEntry (" + mkdir -p \$out/share/fonts/ + cd \$out/share/fonts + for i in ${toString paths}; do + find \$i -type f -exec ln -s '{}' . ';' ; + done + mkfontdir + mkfontscale + ") [minInit addInputs defEnsureDir] ; in stdenv.mkDerivation rec { - name = "wrapped-font-dir"; - builder = writeScript (name + "-builder") - (textClosure localDefs [ doInstall doForceShare doPropagate]); + name = "wrapped-font-dir"; + builder = writeScript (name + "-builder") + (textClosure localDefs [ doInstall doForceShare doPropagate]); preferLocalBuild = true; - meta = { - description = " - Just a wrapper to create fonts.dir and fonts.scale . + meta = { + description = " + Just a wrapper to create fonts.dir and fonts.scale . "; - inherit src; - }; + inherit src; + }; } diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 51505320ba40..00d5cfba27a0 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -17,17 +17,14 @@ stdenv.mkDerivation rec { meta = { description = "GNU Free UCS Outline Fonts"; - longDescription = '' The GNU Freefont project aims to provide a set of free outline (PostScript Type0, TrueType, OpenType...) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). ''; - homepage = http://www.gnu.org/software/freefont/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = []; }; } diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 46b947ce77a2..a5f43d4169b2 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; - - longDescription = ''The Gyre project started in 2006, and will - eventually include enhanced releases of all 35 freely available - PostScript fonts distributed with Ghostscript v4.00. These are - being converted to OpenType and extended with diacritical marks - covering all modern European languages and then some''; - + longDescription = '' + The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some + ''; homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; - license = stdenv.lib.licenses.lppl13c; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 522847a52418..faa126d693e1 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation { the license is available in LICENSE.md" (From the GitHub page) */ license = licenses.free; - platforms = platforms.all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 7fe56987ad36..0424f6e727c8 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "MPH-2B-Damase"; + src = fetchurl { url = http://www.wazu.jp/downloads/damase_v.2.zip; sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; }; + buildInputs = [unzip]; + unpackPhase = '' unzip $src; ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index bcbf57498106..f90cb98b8024 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -40,19 +40,18 @@ stdenv.mkDerivation rec { meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; - - longDescription = '' The Nafees font family is developed according - to calligraphic rules, following the style of Syed Nafees - Al-Hussaini (Nafees Raqam) one of the finest calligraphers of - Pakistan ''; - + longDescription = '' + The Nafees font family is developed according + to calligraphic rules, following the style of Syed Nafees + Al-Hussaini (Nafees Raqam) one of the finest calligraphers of + Pakistan + ''; homepage = "http://www.cle.org.pk/software/localization.htm"; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 946efa00b9ab..c0d533ca6204 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -19,15 +19,12 @@ stdenv.mkDerivation rec { meta = { description = "Open Sans fonts"; - longDescription = '' Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = "http://en.wikipedia.org/wiki/Open_Sans"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 1bd0d8980677..7298dbb18cef 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { meta = { description = "Medium contrast serif font"; longDescription = '' - With short ascenders and a very high x-height, Poly is efficient in small - sizes. Thanks to its careful balance between the x-height and glyph widths, - it allows more economy and legibility than standard web serifs, even in - small sizes. The aglutinative language for which it was designed contains - very long words. The goal was to develop a typeface that would tolerate - cramped tracking and that would increase the number of letters on a single - line. Poly is a Unicode typeface family that supports Open Type features - and languages that use the Latin script and its variants. + With short ascenders and a very high x-height, Poly is efficient in small + sizes. Thanks to its careful balance between the x-height and glyph widths, + it allows more economy and legibility than standard web serifs, even in + small sizes. The aglutinative language for which it was designed contains + very long words. The goal was to develop a typeface that would tolerate + cramped tracking and that would increase the number of letters on a single + line. Poly is a Unicode typeface family that supports Open Type features + and languages that use the Latin script and its variants. ''; homepage = http://www.fontsquirrel.com/fonts/poly; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index 369ab3493f34..df206fe13b5a 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -38,9 +37,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index a9304769378d..cd5c50309412 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -40,9 +39,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 1dfaa376df4c..10766d9fa788 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation { name = "ttf-bitstream-vera-1.10"; + src = fetchurl { url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; }; + buildPhase = "true"; + installPhase = " fontDir=$out/share/fonts/truetype mkdir -p $fontDir -- cgit 1.4.1