Merge recent master into x-updates

Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix

9 files changed, 88 insertions, 4 deletions

diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index 92f61788892..e1d9e1614f3 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/freefont/;
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix
new file mode 100644
index 00000000000..2e0f3d5df2a
--- /dev/null
+++ b/pkgs/data/fonts/opensans-ttf/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl}:
+
+# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD
+
+stdenv.mkDerivation rec {
+  name = "opensans-ttf-20140617";
+
+  src = fetchurl {
+    url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz";
+    sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4";
+  };
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = {
+    description = "Open Sans fonts";
+
+    longDescription = ''
+      Open Sans is a humanist sans serif typeface designed by Steve Matteson,
+      Type Director of Ascender Corp.
+    '';
+
+    homepage = "http://en.wikipedia.org/wiki/Open_Sans";
+    license = "Apache";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/data/fonts/source-han-sans/base.nix b/pkgs/data/fonts/source-han-sans/base.nix
new file mode 100644
index 00000000000..d319f41f2e5
--- /dev/null
+++ b/pkgs/data/fonts/source-han-sans/base.nix
@@ -0,0 +1,26 @@
+{version ? "1.000", prefix, url, sha256, description}:
+
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  inherit version;
+  name = "${prefix}-${version}";
+
+  src = fetchurl {
+    inherit url sha256;
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp $( find . -name '*.otf' ) $out/share/fonts/truetype
+  '';
+
+  meta = {
+    inherit description;
+
+    homepage = http://sourceforge.net/adobe/source-han-sans/;
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix
new file mode 100644
index 00000000000..4aacdbf62e2
--- /dev/null
+++ b/pkgs/data/fonts/source-han-sans/japanese.nix
@@ -0,0 +1,6 @@
+import ./base.nix {
+  prefix = "source-han-sans-japanese";
+  url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip";
+  sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82";
+  description = "Japanese subset of an open source Pan-CJK typeface";
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix
new file mode 100644
index 00000000000..cf3ecd9e12e
--- /dev/null
+++ b/pkgs/data/fonts/source-han-sans/korean.nix
@@ -0,0 +1,6 @@
+import ./base.nix {
+  prefix = "source-han-sans-korean";
+  url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip";
+  sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8";
+  description = "Korean subset of an open source Pan-CJK typeface";
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix
new file mode 100644
index 00000000000..8e920455e45
--- /dev/null
+++ b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix
@@ -0,0 +1,6 @@
+import ./base.nix {
+  prefix = "source-han-sans-simplified-chinese";
+  url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip";
+  sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d";
+  description = "Simplified Chinese subset of an open source Pan-CJK typeface";
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix
new file mode 100644
index 00000000000..b25db8a2515
--- /dev/null
+++ b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix
@@ -0,0 +1,6 @@
+import ./base.nix {
+  prefix = "source-han-sans-traditional-chinese";
+  url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip";
+  sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20";
+  description = "Traditional Chinese subset of an open source Pan-CJK typeface";
+}
\ No newline at end of file
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index ac5beaeee81..7bb1e1d21d5 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20131205";
+  name = "cacert-20140704";
 
   src = fetchurl {
     url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df";
+    sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza";
   };
 
   unpackPhase = "true";
diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix
index e216f4b0278..db4d13b890f 100644
--- a/pkgs/data/misc/miscfiles/default.nix
+++ b/pkgs/data/misc/miscfiles/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/miscfiles/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     description = "Collection of files not of crucial importance for sysadmins";
   };
 }