Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.

7 files changed, 114 insertions, 20 deletions

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index a6c77deb12ea..0f02bb7dc945 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
+{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
+, qtimageformats, qtwebkit, xorg }:
 
 stdenv.mkDerivation rec {
   version = "0.1.1";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
+    xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit libarchive
   ];
 
   configurePhase = ''
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 1ed63f7ac9e9..92caf866eec3 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "fira-code-${version}";
-  version = "0.6";
+  version = "1.101";
 
   src = fetchurl {
-    url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf";
-    sha256 = "1blalxnmrxqlm5i74jhm8j29n0zsnmqi3gppxa9szjzv4x2k5s0a";
+    url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
+    sha256 = "0wbjk4cyibyjp7kjvwnm7as1ch312zwjbi469v26sl41svf53s5v";
   };
 
-  phases = [ "installPhase" ];
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
-    cp -v $src $out/share/fonts/opentype/FiraCode-Regular.otf
+    cp -v *.otf $out/share/fonts/opentype
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 8ad6068a185a..114b88c3040d 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, unzip, lib }:
 let
   fonts = {
-    aegean = { version = "8.00"; file = "Aegean.zip"; sha256 = "09pmazcpxhkx3l8h4gxiixihi1c49pli5gvlcm1b6sbf4xvf9kwm";
+    aegean = { version = "8.00"; file = "Aegean.zip"; sha256 = "0jhj4i0262f4zbm979fm01rnvc91a00kwkbcgvzs281256g2ciny";
                description = "Scripts and symbols of the Aegean world"; };
-    textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "10m6kpyj8cc0b4qxxi78akiyjxcbhxj2wmbicdcfh008jibbaxsz";
+    textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "06igp3hdql0yfaj9h2ahh5n7yvj2ni7rj2jdmz534f9618l8qi6r";
                   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";
+    aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v";
                  description = "Egyptian Hieroglyphs, Coptic, Meroitic"; };
     akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij";
                  description = "Sumero-Akkadian Cuneiform"; };
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 6f5c5a1a55d2..aded5b1cddfa 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.0-beta9";
-  src = fetchurl {
-    url = "https://github.com/be5invis/Iosevka/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "1vw34zh8nh6s2dpyw3a1q44wkgrsin1a8b0vnk7hms8s8fw65734";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner  = "be5invis";
+    repo   = "Iosevka";
+    rev    = "v${version}";
+    sha256 = "1h1lmvjpjk0238bhdhnv2c149s98qpbndc8rxzlk6bhmxcy6rwsk";
   };
-  unpackPhase = ''
-    tar xf "$src"
-  '';
+
   installPhase = ''
     fontdir=$out/share/fonts/iosevka
 
     mkdir -p $fontdir
     cp -v iosevka-* $fontdir
   '';
-  buildInputs = [ ];
+
   meta = with lib; {
     homepage = "http://be5invis.github.io/Iosevka/";
+    downloadPage = "https://github.com/be5invis/Iosevka/releases";
     description = ''
       Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
       Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix
new file mode 100644
index 000000000000..ab163dcca9ff
--- /dev/null
+++ b/pkgs/data/fonts/ipaexfont/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ipaexfont-003.01";
+
+  src = fetchurl {
+    url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
+    sha256 = "0nmfyh10rzkvp0qmrla0dahkmmxq47678y4v8fdm8fpdzmf0kpn7";
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype/
+    cp *.ttf $out/share/fonts/opentype/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Japanese font package with Mincho and Gothic fonts";
+    longDescription = ''
+      IPAex font is a Japanese font developed by the Information-technology
+      Promotion Agency of Japan. It provides both Mincho and Gothic fonts,
+      suitable for both display and printing.
+
+      This is the successor to the IPA fonts.
+    '';
+    homepage = http://ipafont.ipa.go.jp/;
+    license = licenses.ipa;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
new file mode 100644
index 000000000000..3b80781f4145
--- /dev/null
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchzip, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "vanilla-dmz-${version}";
+  version = "0.4.4";
+  src = fetchzip {
+    url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
+    sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj";
+  };
+  buildInputs = [ xorg.xcursorgen ];
+  buildPhase = ''
+    cd DMZ-White/pngs; ./make.sh; cd -
+    cd DMZ-Black/pngs; ./make.sh; cd -
+  '';
+  installPhase = ''
+    install -d $out/share/icons/Vanilla-DMZ/cursors
+    cp -a DMZ-White/xcursors/* $out/share/icons/Vanilla-DMZ/cursors
+    install -Dm644 DMZ-White/index.theme $out/share/icons/Vanilla-DMZ/index.theme
+
+    install -d $out/share/icons/Vanilla-DMZ-AA/cursors
+    cp -a DMZ-Black/xcursors/* $out/share/icons/Vanilla-DMZ-AA/cursors
+    install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme
+  '';
+  meta = with lib; {
+    homepage = "http://jimmac.musichall.cz";
+    description = "A style neutral scalable cursor theme.";
+    platforms = platforms.all;
+    license = licenses.cc-by-nc-sa-30;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
new file mode 100644
index 000000000000..e8afb25b8b39
--- /dev/null
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit }:
+
+let version = "2015-12-14"; in
+stdenv.mkDerivation {
+  name = "wireless-regdb-${version}";
+
+  src = fetchgit {
+    sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
+    url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
+    rev = "refs/tags/master-${version}";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Wireless regulatory database for CRDA";
+    homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
+  };
+}