Merge remote-tracking branch 'upstream/master' into x-updates

mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix

pkgs/data/documentation/man-pages/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.38";
+  name = "man-pages-3.41";
   
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
-    sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy";
+    sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf";
   };
 
   preBuild =

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

@@ -0,0 +1,34 @@
+{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
+
+stdenv.mkDerivation {
+  name = "dosemu-fonts";
+
+  src = fetchurl {
+    url = mirror://sourceforge/dosemu/dosemu-1.4.0.tgz;
+    sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
+  };
+
+  configurePhase = "true";
+  buildPhase = "true";
+
+  buildInputs = [bdftopcf mkfontdir mkfontscale];
+
+  installPhase = ''
+    fontPath="$out/share/fonts/X11/misc/dosemu"
+    mkdir -p "$fontPath"
+    for i in etc/*.bdf; do
+      fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
+      echo -n "Installing font $fontOut..." >&2
+      bdftopcf $i | gzip -c -9 > "$fontOut"
+      echo " done." >&2
+    done
+    cp etc/dosemu.alias "$fontPath/fonts.alias"
+    cd "$fontPath"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = {
+    description = "Various fonts from the DOSEmu project";
+  };
+}

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

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ubuntu-font-family-0.80";
+  buildInputs = [unzip];
+
+  src = fetchurl {
+    url = "http://font.ubuntu.com/download/${name}.zip";
+    sha256 = "0k4f548riq23gmw4zhn30qqkcpaj4g2ab5rbc3lflfxwkc4p0w8h";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/share/fonts/ubuntu
+      cp *.ttf $out/share/fonts/ubuntu
+    '';
+
+  meta = {
+    description = "Ubuntu Font Family";
+    longDescription = "The Ubuntu typeface has been specially
+    created to complement the Ubuntu tone of voice. It has a
+    contemporary style and contains characteristics unique to
+    the Ubuntu brand that convey a precise, reliable and free attitude.";
+    homepage = http://font.ubuntu.com/;
+    license = "free";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.antono ];
+  };
+}

pkgs/data/misc/cacert/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20110902";
+  name = "cacert-20120628";
 
   src = fetchurl {
     url = "http://nixos.org/tarballs/${name}.pem.bz2";
-    sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi";
+    sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir";
   };
 
   unpackPhase = "true";