Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

pkgs/development/interpreters/mujs/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, clang }:
+
+stdenv.mkDerivation rec {
+  name = "mujs-2014-11-29";
+
+  src = fetchgit {
+    url = git://git.ghostscript.com/mujs.git;
+    rev  = "6afabf445cad0dd9afbc1f5870dba730801f09c0";
+    sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n";
+  };
+
+  buildInputs = [ clang ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://mujs.com/;
+    description = "A lightweight, embeddable Javascript interpreter";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+    license = licenses.gpl3;
+  };
+}

pkgs/development/interpreters/nix-exec/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "3.0.2";
+  version = "4.0.0";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "1c45ardfk0qm3n7hx8wvsmyw6zs47sjcs2pd4rg4n87wsdi3hv7k";
+    sha256 = "0qw25v8pzx08mirhy46dmqj93nwnxfvgw2jsn8rvxh2d7x4nc8jv";
   };
 
   buildInputs = [ pkgconfig nix git ];