Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

pkgs/data/fonts/culmus/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "culmus-${version}";
+  version = "0.130";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
+    sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1";
+  };
+  
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype/
+  '';
+  
+  meta = {
+    description = "Culmus Hebrew fonts";
+    longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://culmus.sourceforge.net/;
+    downloadPage = http://culmus.sourceforge.net/download.html;
+  };
+}

pkgs/data/fonts/fira-mono/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-mono-3.205";
+  name = "fira-mono-3.206";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip;
-    sha256 = "0zd4wy8ksbz0qiiqgl9w7zyh34q8n983dyb44g5dfdcjakj09qlz";
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip;
+    sha256 = "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi";
   };
 
   buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3205";
+  sourceRoot = "FiraMonoFonts3206";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

pkgs/data/fonts/fira/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.105";
+  name = "fira-4.106";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4105.zip;
-    sha256 = "1857kpn7p7fc1xsmqx9589hk396ggwzd167yc3dmn1mh5dixibfz";
+    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip;
+    sha256 = "123xwd7abb96lsla1v579vfpvc7fwixhq78221qxrw4dv8mgf8id";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4105";
+  sourceRoot = "FiraFonts4106";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

pkgs/data/fonts/gdouros/default.nix

@@ -0,0 +1,57 @@
+{stdenv, fetchurl, unzip, lib }:
+let
+  fonts = {
+    aegean = { version = "8.00"; file = "Aegean.zip"; sha256 = "09pmazcpxhkx3l8h4gxiixihi1c49pli5gvlcm1b6sbf4xvf9kwm";
+               description = "Scripts and symbols of the Aegean world"; };
+    textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "10m6kpyj8cc0b4qxxi78akiyjxcbhxj2wmbicdcfh008jibbaxsz";
+                  description = "Fonts based on early Greek editions"; };
+    symbola = { version = "8.00"; file = "Symbola.zip"; sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd";
+                description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; };
+    aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "092vci45wp9x0yky6dcfky4bs4avaxn6xpai3bs74gxskd2j9s3q";
+                 description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
+    akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij";
+                 description = "Sumero-Akkadian Cuneiform"; };
+    anatolian = { version = "5.02"; file = "Anatolian.zip"; sha256 = "0arm58sijzk0bqmfb70k1sjvq79wgw16hx3j2g4l8qz4sv05bp8l";
+                  description = "Anatolian Hieroglyphs"; };
+    maya = { version = "4.14"; file = "Maya.zip"; sha256 = "0l97racgncrhb96mfbsx8dr5n4j289iy0nnwhxf9b21ns58a9x4f";
+             description = "Maya Hieroglyphs"; };
+    unidings = { version = "8.00"; file = "Unidings.zip"; sha256 = "1i0z3mhgj4680188lqpmk7rx3yiz4l7yybb4wq6zk35j75l28irm";
+                 description = "Glyphs and Icons for blocks of The Unicode Standard"; };
+    musica = { version = "3.12"; file = "Musica.zip"; sha256 = "079vyb0mpxvlcf81d5pqh9dijkcvidfbcyvpbgjpmgzzrrj0q210";
+               description = "Musical Notation"; };
+    analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f";
+                 description = "Coptic, Gothic, Deseret"; };
+  };
+  mkpkg = name_: {version, file, sha256, description}:
+    stdenv.mkDerivation rec {
+      name = "${name_}-${version}";
+
+      src = fetchurl {
+        url = "http://users.teilar.gr/~g1951d/${file}";
+        inherit sha256;
+      };
+
+      buildInputs = [ unzip ];
+
+      sourceRoot = ".";
+
+      installPhase = ''
+        mkdir -p $out/share/fonts/truetype
+        cp -v *.ttf $out/share/fonts/truetype/
+
+        mkdir -p "$out/doc/${name}"
+        cp -v *.docx *.pdf *.xlsx "$out/doc/${name}/"
+      '';
+
+      meta = {
+        inherit description;
+        # In lieu of a license:
+        # Fonts in this site are offered free for any use;
+        # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
+        license = stdenv.lib.licenses.free;
+        homepage = http://users.teilar.gr/~g1951d/;
+      };
+    };
+
+in
+lib.mapAttrs mkpkg fonts

pkgs/data/fonts/hack/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.015"; in
+let version = "2.017"; in
 stdenv.mkDerivation {
   name = "hack-font-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "0x0c3wwxiidl5a6axbcwizxny5q2yc6l4724smdj4gmn1xa137g5";
+    sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

pkgs/data/fonts/hanazono/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "hanazono-${version}";
+  version = "20141012";
+
+  src = fetchurl {
+    url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-20141012.zip";
+    sha256 = "020jhqnzm9jvkmfvvyk1my26ncwxbnb9yc8v7am252jwrifji9q6";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/hanazono
+    cp *.ttf $out/share/fonts/hanazono
+    mkdir -p $out/share/doc/hanazono
+    cp *.txt $out/share/doc/hanazono
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Free kanji font containing 96,327 characters";
+    homepage = http://fonts.jp/hanazono/;
+
+    # Dual-licensed under OFL and the following:
+    # This font is a free software.
+    # Unlimited permission is granted to use, copy, and distribute it, with
+    # or without modification, either commercially and noncommercially.
+    # THIS FONT IS PROVIDED "AS IS" WITHOUT WARRANTY.
+    license = [ licenses.ofl licenses.free ];
+    maintainers = with maintainers; [ mathnerd314 ];
+    platforms = platforms.all;
+  };
+}

pkgs/data/fonts/kawkab-mono/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "kawkab-mono-20151015";
+
+  src = fetchurl {
+    url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
+    sha256 = "16pv9s4q7199aacbzfi2d10rcrq77vyfvzcy42g80nhfrkz1cb0m";
+  };
+
+  buildInputs = [ unzip ];
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = {
+    description = "An arab fixed-width font";
+    homepage = "http://makkuk.com/kawkab-mono/";
+    license = stdenv.lib.licenses.ofl;
+  };
+}
+
+

pkgs/data/fonts/lohit-fonts/default.nix

@@ -1,22 +1,58 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "lohit-fonts-20140220";
-  src = fetchurl {
-    url = https://fedorahosted.org/releases/l/o/lohit/lohit-ttf-20140220.tar.gz;
-    sha256 = "1rmgr445hw1n851ywy28csfvswz1i6hnc8mzp88qw2xk9j4dn32d";
+{ stdenv, fetchurl, lib }:
+let
+  fonts = {
+    assamese = { version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; };
+    bengali = { version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; };
+    devanagari = { version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; };
+    gujarati = { version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; };
+    gurmukhi = { version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi
+    kannada = { version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; };
+    malayalam = { version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; };
+    marathi = { version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; };
+    nepali = { version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; };
+    odia = { version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya
+    tamil-classical = { version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; };
+    tamil = { version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; };
+    telugu = { version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; };
   };
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://fedorahosted.org/lohit/;
-    description = "Fonts for 21 Indian languages";
-    license = licenses.ofl;
-    maintainers = [ maintainers.ttuegel ];
-    platforms = platforms.all;
+  gplfonts = {
+    # GPL fonts removed from later releases
+    kashmiri = { version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; };
+    konkani = { version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; };
+    maithili = { version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; };
+    sindhi = { version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; };
   };
-}
+  mkpkg = license: name: {version, sha256}:
+    stdenv.mkDerivation {
+      name = "lohit-${name}-${version}";
+
+      src = fetchurl {
+        url = "https://fedorahosted.org/releases/l/o/lohit/lohit-${name}-ttf-${version}.tar.gz";
+        inherit sha256;
+      };
+
+      installPhase = ''
+        mkdir -p $out/share/fonts/truetype
+        cp -v *.ttf $out/share/fonts/truetype/
+
+        mkdir -p $out/etc/fonts/conf.d
+        cp -v *.conf $out/etc/fonts/conf.d
+
+        mkdir -p "$out/share/doc/lohit-${name}"
+        cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/"
+      '';
+
+      meta = {
+        inherit license;
+        homepage = https://fedorahosted.org/lohit/;
+        maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ];
+        # Set a non-zero priority to allow easy overriding of the
+        # fontconfig configuration files.
+        priority = 5;
+      };
+    };
+
+in
+# Technically, GPLv2 with usage exceptions
+lib.mapAttrs (mkpkg lib.licenses.gpl2) gplfonts //
+lib.mapAttrs (mkpkg lib.licenses.ofl) fonts

pkgs/data/fonts/marathi-cursive/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation rec {
+  name = "marathi-cursive-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z";
+    sha256 = "0zhqkkfkz5mhfz8xv305s16h80p9v1iva829fznxd2c44ngyplmc";
+  };
+
+  buildInputs = [ p7zip ];
+
+  unpackCmd = "7z x $curSrc";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/marathi-cursive
+    cp -v *.otf *.ttf $out/share/fonts/marathi-cursive
+    mkdir -p $out/share/doc/${name}
+    cp -v README *.txt $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/MihailJP/marathi-cursive;
+    description = "Modi script font with Graphite and OpenType support";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.mit; # It's the M+ license, M+ is MIT(-ish)
+    platforms = platforms.all;
+  };
+}

pkgs/data/fonts/mro-unicode/default.nix

@@ -0,0 +1,20 @@
+{ lib, runCommand, fetchurl }:
+
+runCommand "mro-unicode-2013-05-25" {
+  src = fetchurl {
+    url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf";
+    sha256 = "1za74ych0sh97ks6qp9iqq9jankgnkrq65s350wsbianwi72di45";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/phjamr/MroUnicode;
+    description = "Unicode-compliant Mro font";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
+''
+  mkdir -p $out/share/fonts/truetype
+  cp $src $out/share/fonts/truetype/MroUnicode-Regular.ttf
+''

pkgs/data/fonts/oldsindhi/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation rec {
+  name = "oldsindhi-${version}";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z";
+    sha256 = "1sbmxyxi81k88hkfw7gnnpgd5vy2vyj5y5428cd6nz4zlaclgq8z";
+  };
+
+  buildInputs = [ p7zip ];
+
+  unpackCmd = "7z x $curSrc";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.ttf $out/share/fonts/truetype/
+    cp -v README *.txt $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/MihailJP/oldsindhi;
+    description = "Free Sindhi Khudabadi font";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+}

pkgs/data/fonts/paratype-pt/mono.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "paratype-pt-mono";
+
+  src = fetchurl rec {
+    url = "http://www.paratype.ru/uni/public/PTMono.zip";
+    sha256 = "1wqaai7d6xh552vvr5svch07kjn1q89ab5jimi2z0sbd0rbi86vl";
+  };
+
+  buildInputs = [unzip];
+
+  phases = "unpackPhase installPhase";
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/paratype
+    cp *.ttf $out/share/fonts/truetype
+    cp *.txt $out/share/doc/paratype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.paratype.ru/public/"; 
+    description = "An open Paratype font";
+
+    license = "Open Paratype license"; 
+    # no commercial distribution of the font on its own
+    # must rename on modification
+    # http://www.paratype.ru/public/pt_openlicense.asp
+
+    platforms = platforms.all;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
+

pkgs/data/fonts/paratype-pt/sans.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "paratype-pt-sane";
+
+  src = fetchurl rec {
+    url = "http://www.paratype.ru/uni/public/PTSans.zip";
+    sha256 = "1j9gkbqyhxx8pih5agr9nl8vbpsfr9vdqmhx73ji3isahqm3bhv5";
+  };
+
+  buildInputs = [unzip];
+
+  phases = "unpackPhase installPhase";
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/paratype
+    cp *.ttf $out/share/fonts/truetype
+    cp *.txt $out/share/doc/paratype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.paratype.ru/public/"; 
+    description = "An open Paratype font";
+
+    license = "Open Paratype license"; 
+    # no commercial distribution of the font on its own
+    # must rename on modification
+    # http://www.paratype.ru/public/pt_openlicense.asp
+
+    platforms = platforms.all;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
+

pkgs/data/fonts/paratype-pt/serif.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "paratype-pt-serif";
+
+  src = fetchurl rec {
+    url = "http://www.paratype.ru/uni/public/PTSerif.zip";
+    sha256 = "0x3l58c1rvwmh83bmmgqwwbw9av1mvvq68sw2hdkyyihjvamyvvs";
+  };
+
+  buildInputs = [unzip];
+
+  phases = "unpackPhase installPhase";
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/paratype
+    cp *.ttf $out/share/fonts/truetype
+    cp *.txt $out/share/doc/paratype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.paratype.ru/public/"; 
+    description = "An open Paratype font";
+
+    license = "Open Paratype license"; 
+    # no commercial distribution of the font on its own
+    # must rename on modification
+    # http://www.paratype.ru/public/pt_openlicense.asp
+
+    platforms = platforms.all;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
+

pkgs/data/fonts/sampradaya/default.nix

@@ -0,0 +1,20 @@
+{ lib, runCommand, fetchurl }:
+
+runCommand "sampradaya-2015-05-26" {
+  src = fetchurl {
+    url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf";
+    sha256 = "0110k1yh5kz3f04wp72bfz59pxjc7p6jv7m5p0rqn1kqbf7g3pck";
+  };
+
+  meta = with lib; {
+    homepage = https://bitbucket.org/OorNaattaan/sampradaya/;
+    description = "Unicode-compliant Grantha font";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.ofl; # See font metadata
+    platforms = platforms.all;
+  };
+}
+''
+  mkdir -p $out/share/fonts/truetype
+  cp $src $out/share/fonts/truetype/Sampradaya.ttf
+''

pkgs/data/fonts/signwriting/default.nix

@@ -0,0 +1,28 @@
+{ lib, runCommand, fetchurl }:
+
+runCommand "signwriting-1.1.4" {
+  src1 = fetchurl {
+    url = "https://github.com/Slevinski/signwriting_2010_fonts/raw/61c8e7123a1168657b5d34d85266a637f67b9d2b/fonts/SignWriting%202010.ttf";
+    name = "SignWriting_2010.ttf";
+    sha256 = "1abjzykbjx2hal8mrxp51rvblv3q84akyn9qhjfaj20rwphkf5zj";
+  };
+
+  src2 = fetchurl {
+    url = "https://github.com/Slevinski/signwriting_2010_fonts/raw/61c8e7123a1168657b5d34d85266a637f67b9d2b/fonts/SignWriting%202010%20Filling.ttf";
+    name = "SignWriting_2010_Filling.ttf";
+    sha256 = "0am5wbf7jdy9szxkbsc5f3959cxvbj7mr0hy1ziqmkz02c6xjw2m";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/Slevinski/signwriting_2010_fonts;
+    description = "Typeface for written sign languages";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
+''
+  mkdir -p $out/share/fonts/truetype
+  cp $src1 $out/share/fonts/truetype/SignWriting_2010.ttf
+  cp $src2 $out/share/fonts/truetype/SignWriting_2010_Filling.ttf
+''

pkgs/data/fonts/symbola/default.nix

@@ -1,34 +0,0 @@
-{stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "symbola-8.00";
-
-  src = fetchurl {
-    url = "http://users.teilar.gr/~g1951d/Symbola.zip";
-    sha256 = "1lfs2j816332ysvpb5ibj2gwpmyqyispqdl7skkshf2gra18hmhd";
-  };
-
-  buildInputs = [ unzip ];
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    unzip ${src}
-    mkdir -p $out/share/fonts/truetype
-    cp -v Symbola.ttf $out/share/fonts/truetype/
-    cp -v Symbola_hint.ttf $out/share/fonts/truetype/
-
-    mkdir -p "$out/doc/${name}"
-    cp -v Symbola.docx "$out/doc/${name}/"
-    cp -v Symbola.pdf "$out/doc/${name}/"
-  '';
-
-  meta = {
-    description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode";
-    # In lieu of a license:
-    # Fonts in this site are offered free for any use;
-    # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
-    license = stdenv.lib.licenses.free;
-    homepage = http://users.teilar.gr/~g1951d/;
-  };
-}

pkgs/data/fonts/tai-languages/default.nix

@@ -0,0 +1,25 @@
+{ lib, runCommand, fetchurl }:
+
+{
+tai-ahom = runCommand "tai-ahom-2015-07-06" {
+  src = fetchurl {
+    url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true";
+    sha256 = "0zpjsylm29qc3jdv5kv0689pcirai46j7xjp5dppi0fmzxaxqnsk";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/enabling-languages/tai-languages;
+    description = "Unicode-compliant Tai Ahom font";
+    maintainers = with maintainers; [ mathnerd314 ];
+    license = licenses.ofl; # See font metadata
+    platforms = platforms.all;
+  };
+}
+''
+  mkdir -p $out/share/fonts/truetype
+  cp $src $out/share/fonts/truetype/AhomUnicode.ttf
+'';
+
+# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
+
+}

pkgs/data/fonts/terminus-font/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.39";
+  name = "terminus-font-4.40";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
-    sha256 = "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i";
+    sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4";
   };
 
   buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];

pkgs/data/fonts/ubuntu-font-family/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "ubuntu-font-family-0.80";
+  name = "ubuntu-font-family-0.83";
   buildInputs = [unzip];
 
   src = fetchurl {
     url = "http://font.ubuntu.com/download/${name}.zip";
-    sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h";
+    sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5";
   };
 
   installPhase =

pkgs/data/fonts/unifont_upper/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "unifont_upper-${version}";
+  version = "8.0.01";
+
+  ttf = fetchurl {
+    url = "http://unifoundry.com/pub/unifont-8.0.01/font-builds/${name}.ttf";
+    sha256 = "0ffqm85bk345pnql1x0rbg0z31472y844xibb27njjg4avb21lga";
+  };
+
+  phases = "installPhase";
+
+  installPhase =
+    ''
+      mkdir -p $out/share/fonts/truetype
+      cp -v ${ttf} $out/share/fonts/truetype/unifont_upper.ttf
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
+    homepage = http://unifoundry.com/unifont.html;
+
+    # Basically GPL2+ with font exception.
+    license = http://unifoundry.com/LICENSE.txt;
+    maintainers = [ maintainers.mathnerd314 ];
+    platforms = platforms.all;
+  };
+}

pkgs/data/icons/elementary-icon-theme/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "3.2.2";
+
+  package-name = "elementary-icon-theme";
+
+  name = "${package-name}-${version}";
+
+  src = fetchzip {
+    url = "https://launchpad.net/elementaryicons/3.x/${version}/+download/elementary-icon-theme-${version}.tar.xz";
+    sha256 = "0b6sgvkzc5h9zm3la6f0ngs9pfjrsj318qcynxd3yydb50cd3hnf";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/icons
+    cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/
+  '';
+
+  meta = with stdenv.lib; {
+  description = "Elementary icon theme";
+  homepage = "https://launchpad.net/elementaryicons";
+  license = licenses.gpl3;
+  platforms = platforms.all;
+  maintainers = with maintainers; [ simonvandel ];
+  };
+}

pkgs/data/icons/numix-icon-theme-circle/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "4727aa5";
+  version = "129da4d8036c9ea52ba8b94cdfa0148e4c2cff96";
 
   package-name = "numix-icon-theme-circle";
   
-  name = "${package-name}-20151005";
+  name = "${package-name}-20151014";
 
   buildInputs = [ unzip ];
   
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "0khps3il0wyjizzzv8rxznhywp3nqd1hj1zhdvyqzgql3gffylqc";
+    sha256 = "1505j63qh96hy04x3ywc6kspavzgjd848cgdkda23kjdbx0fpij4";
   };
 
   dontBuild = true;

pkgs/data/icons/numix-icon-theme/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "ae57260";
+  version = "0f7641b048a07eb614662c502eb209dad5eb6d97";
 
   package-name = "numix-icon-theme";
 
-  name = "${package-name}-20150910";
+  name = "${package-name}-20151023";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "147a8d9wkhrq4f4154gb0l16rj849lsccxl8npicr6zixvsjgqlq";
+    sha256 = "16kbasgbb5mgiyl9b240215kivdnl8ynpkxhp5gairba9l4jpbih";
   };
 
   dontBuild = true;

pkgs/data/misc/geolite-legacy/default.nix

@@ -8,29 +8,29 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-09-29";
+  version = "2015-11-04";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0";
+    "18nwbxy6l153zhd7fi4zdyibnmpcb197p3jlb9cjci852asd465l";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
+    "0dm8qvsx8vpwdv9y4z70jiws9bwmw10vdn5sc8jdms53p4rgr4n4";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g";
+    "1bq9kg6fsdsjssd3i6phq26n1px9jmljnq60gfsh8yb9s18hymfq";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
+    "0anx3kppql6wzkpmkf7k1322g4ragb5hh96apl71n2lmwb33i148";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1b8rk3crnm94ndlkw99h7iyn9daznf7sirck1zs80ppg7c69gknp";
+    "1k747llmralv2n2krfc1v9f8vdjc3ih3xsgf6g1y60cr78sl197p";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "06hwj3ksfz4ikh84cqcdl1xi4rkrc9cz26h31vg9w5awx5kbbc10";
+    "1ppsn39c3n9llskynwbainy5wx6cl3qmhp6ifsylk0ac3jcdr7b9";
 
   meta = with stdenv.lib; {
     inherit version;