data/fonts: simpler cleanups

95 files changed, 870 insertions, 1093 deletions

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 562aa8be4eff..5c708457f8d2 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -1,22 +1,18 @@
 { stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "andagii-${version}";
+let
   version = "1.0.2";
+in fetchzip {
+  name = "andagii-${version}";
 
-  src = fetchzip {
-    url = http://www.i18nguy.com/unicode/andagii.zip;
-    sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k";
-    stripRoot = false;
-    curlOpts = "--user-agent 'Mozilla/5.0'";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
+  url = http://www.i18nguy.com/unicode/andagii.zip;
+  curlOpts = "--user-agent 'Mozilla/5.0'";
+  postFetch = ''
+    unzip $downloadedFile
     mkdir -p $out/share/fonts/truetype
     cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
   '';
+  sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2";
 
   # There are multiple claims that the font is GPL, so I include the
   # package; but I cannot find the original source, so use it on your
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index da34a2f43aa6..ff8813f78139 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "anonymousPro-${version}";
+let
   version = "1.002";
+in fetchzip rec {
+  name = "anonymousPro-${version}";
 
-  src = fetchurl {
-    url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
-    sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    mkdir -p $out/share/doc/${name}
-    find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \;
-    find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
+  url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
+  postFetch = ''
+    mkdir -p $out/share/{doc,fonts}
+    unzip -j $downloadedFile \*.ttf                           -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.txt                           -d "$out/share/doc/${name}"
   '';
+  sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f";
 
   meta = with stdenv.lib; {
     homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 59be4fd14c89..c2e64cb63dd1 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl }:
-stdenv.mkDerivation rec {
-  name = "arkpandora-${version}";
-  version = "2.04";
+{ stdenv, fetchurl, unzip }:
 
-  src = fetchurl {
-    urls = [
-      "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
-      "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
-      "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
-      ];
-    sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
-  };
+let
+  version = "2.04";
+in fetchurl {
+  name = "arkpandora-${version}";
 
-  installPhase = ''
+  urls = [
+    "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
+    "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
+    "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
+  ];
+  downloadToTemp = true;
+  recursiveHash = true;
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
+  sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k";
 
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index 9941b4791b58..1a83ce17646e 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -1,21 +1,14 @@
-{stdenv, fetchgit}:
+{stdenv, fetchzip}:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "aurulent-sans-0.1";
 
-  src = fetchgit {
-    url = "https://github.com/deepfire/hartke-aurulent-sans.git";
-    rev = "refs/tags/${name}";
-    sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    fontDir=$out/share/fonts/opentype
-    mkdir -p $fontDir
-    cp *.otf $fontDir
+  url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip";
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
+  sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li";
 
   meta = {
     description = "Aurulent Sans";
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix
index ba1f21c186e1..555bba63354c 100644
--- a/pkgs/data/fonts/baekmuk-ttf/default.nix
+++ b/pkgs/data/fonts/baekmuk-ttf/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
+fetchzip rec {
   name = "baekmuk-ttf-2.2";
 
-  src = fetchurl {
-    url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
-    sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8";
-  };
-
-  dontBuild = true;
-
-  installPhase = let
-    fonts_dir = "$out/share/fonts";
-    doc_dir = "$out/share/doc/${name}";
-  in ''
-    mkdir -pv ${fonts_dir}
-    mkdir -pv ${doc_dir}
-    cp ttf/*.ttf ${fonts_dir}
-    cp COPYRIGHT* ${doc_dir}
+  url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
+  postFetch = ''
+    tar -xzvf $downloadedFile --strip-components=1
+    mkdir -p $out/share/fonts $out/share/doc/${name}
+    cp ttf/*.ttf  $out/share/fonts
+    cp COPYRIGHT* $out/share/doc/${name}
   '';
+  sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g";
 
   meta = {
     description = "Korean font";
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix
index 110405839a12..56d8273f78ab 100644
--- a/pkgs/data/fonts/caladea/default.nix
+++ b/pkgs/data/fonts/