Merge branch 'master' into closure-size

8 files changed, 156 insertions, 86 deletions

diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix
index 78b3aa1c8b3e..3fb21a241bfe 100644
--- a/pkgs/data/documentation/man-pages-posix/default.nix
+++ b/pkgs/data/documentation/man-pages-posix/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "POSIX man-pages (0p, 1p, 3p)";
-    homepage = http://kernel.org/pub/linux/docs/manpages/;
+    homepage = https://www.kernel.org/doc/man-pages/;
   };
 }
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 923b95040fb8..ae7cac62bcbf 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "4.02"; in
+let version = "4.03"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
+    sha256 = "177w71rwsw3lsh9pjqy625s5iwz1ahdaj7prys1bpc4bqi78q5mh";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
deleted file mode 100644
index cbd3234b2d44..000000000000
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Pthread man pages from LinuxThreads.
-
-   Some of these pages are superseded by those in the `man-pages'
-   package, but not all.  Like other distros (e.g., Debian's
-   `glibc-doc' package) we take man pages from LinuxThreads so that
-   we can cover pretty much all of pthreads.  */
-
-{ fetchurl, stdenv, perl }:
-
-let version = "2.5";
-in
-  stdenv.mkDerivation rec {
-    name = "pthread-man-pages-${version}";
-
-    src = fetchurl {
-      url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2";
-      sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf";
-    };
-
-    buildInputs = [ perl ];
-
-    unpackPhase = ''
-      echo "unpacking to \`${name}'"
-      mkdir "${name}"
-      cd "${name}"
-      tar xjvf "$src"
-    '';
-
-    patchPhase = ''
-      mkdir -p "$out/share/man/man3"
-
-      sed -i "linuxthreads/man/Makefile" \
-          -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ;
-              s|3thr|3|g"
-    '';
-
-    preConfigure = "cd linuxthreads/man";
-
-    postInstall = ''
-      chmod a-x $out/share/man/man3/*.3
-    '';
-
-    meta = {
-      description = "POSIX threads (pthreads) manual pages from LinuxThreads";
-      homepage = http://www.gnu.org/software/libc/;
-      maintainers = [ stdenv.lib.maintainers.mornfall ];
-    };
-  }
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
new file mode 100644
index 000000000000..d08887a5cdee
--- /dev/null
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -0,0 +1,61 @@
+{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
+
+stdenv.mkDerivation rec {
+  version = "2.92";
+  name = "dina-font-pcf-${version}";
+
+  src = fetchurl {
+    url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
+    sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
+  };
+
+  buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];
+
+  dontBuild = true;
+  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
+  installPhase = ''
+    _get_font_size() {
+      _pt=$\{1%.bdf}
+      _pt=$\{_pt#*-}
+      echo $_pt
+    }
+
+    for i in Dina_i400-*.bdf; do
+        bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i
+    done
+    for i in Dina_i700-*.bdf; do
+        bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i
+    done
+    for i in Dina_r400-*.bdf; do
+        bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i
+    done
+    for i in Dina_r700-*.bdf; do
+        bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i
+    done
+    gzip *.pcf
+
+    fontDir="$out/share/fonts/misc"
+    mkdir -p "$fontDir"
+    mv *.pcf.gz "$fontDir"
+
+    cd "$fontDir"
+    mkfontdir
+    mkfontscale
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "A monospace bitmap font aimed at programmers";
+    longDescription = ''
+      Dina is a monospace bitmap font, primarily aimed at programmers. It is
+      relatively compact to allow a lot of code on screen, while (hopefully)
+      clear enough to remain readable even at high resolutions.
+    '';
+    homepage = https://www.donationcoder.com/Software/Jibz/Dina/;
+    downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
+    license = licenses.free;
+    maintainers = [ maintainers.prikhi ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index be420df48865..a206bd7f9115 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   version = "2.92";
@@ -9,42 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
   };
 
-  buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];
+  nativeBuildInputs = [ unzip ];
+  phases = [ "unpackPhase" "installPhase" ];
 
-  dontBuild = true;
-  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
-  installPhase = ''
-    _get_font_size() {
-      _pt=$\{1%.bdf}
-      _pt=$\{_pt#*-}
-      echo $_pt
-    }
-
-    for i in Dina_i400-*.bdf; do
-        bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_i700-*.bdf; do
-        bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_r400-*.bdf; do
-        bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_r700-*.bdf; do
-        bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i
-    done
-    gzip *.pcf
-
-    fontDir="$out/share/fonts/misc"
-    mkdir -p "$fontDir"
-    mv *.pcf.gz "$fontDir"
-
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
+  installPhase =
+  ''
+    mkdir -p $out/share/fonts
+    cp *.bdf $out/share/fonts
   '';
 
-  preferLocalBuild = true;
-
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
new file mode 100644
index 000000000000..784dfe710078
--- /dev/null
+++ b/pkgs/data/fonts/droid/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "font-droid-${version}";
+  version = "2015-12-09";
+  at = "2776afefa9e0829076cd15fdc41e7950e2ffab82";
+
+  srcs = [
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf";
+      sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf";
+      sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf";
+      sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf";
+      sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf";
+      sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf";
+      sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0";
+    })
+    (fetchurl {
+      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf";
+      sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi";
+    })
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+    cp $curSrc ./$ttfName
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/droid
+    cp *.ttf $out/share/fonts/droid
+  '';
+
+  meta = {
+    description = "Droid Family fonts by Google Android";
+    homepage = [ https://github.com/google/fonts ];
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix
index 91bf95d1ea25..fe23b04c551e 100644
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/pkgs/data/fonts/ipafont/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ipafont-003.03";
 
   src = fetchurl {
-    url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php";
+    url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
     sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5";
   };
 
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix
new file mode 100644
index 000000000000..578e0180ec39
--- /dev/null
+++ b/pkgs/data/soundfonts/fluid/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "Fluid-3";
+
+  src = fetchurl {
+    url = "http://www.musescore.org/download/fluid-soundfont.tar.gz";
+    sha256 = "1f96bi0y6rms255yr8dfk436azvwk66c99j6p43iavyq8jg7c5f8";
+  };
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Frank Wen's pro-quality GM/GS soundfont";
+    homepage = "http://www.hammersound.net/";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}