Merge branch 'master' into x-updates

Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)

pkgs/development/tools/misc/autogen/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, which }:
+{ fetchurl, stdenv, guile, which, libffi }:
 
 let version = "5.17"; in
 
@@ -10,7 +10,7 @@ let version = "5.17"; in
       sha256 = "065mg9gfb605wxbsk3inf93528ygcjgg6j8ml51691f6ghj363ff";
     };
 
-    buildInputs = [ guile which ];
+    buildInputs = [ guile which libffi ];
 
     patchPhase =
       '' for i in $(find -name \*.in)

pkgs/development/tools/misc/premake/3.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+let baseName = "premake";
+  version  = "3.7";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    install -Dm755 bin/premake $out/bin/premake
+  '';
+
+  meta = {
+    homepage = http://industriousone.com/premake;
+    description = "A simple build configuration and project generation tool using lua";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}

pkgs/development/tools/misc/premake/default.nix

@@ -1,21 +1,25 @@
 {stdenv, fetchurl, unzip}:
 
 let baseName = "premake";
-    version  = "3.7";
+  version  = "4.3";
 in
 
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
-    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+    url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip";
+    sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
   };
 
   buildInputs = [unzip];
 
+  buildPhase = ''
+    make -C build/gmake.unix/
+  '';
+
   installPhase = ''
-    install -Dm755 bin/premake $out/bin/premake
+    install -Dm755 bin/release/premake4 $out/bin/premake4
   '';
 
   meta = {