Merge remote-tracking branch 'master' into staging.

5 files changed, 46 insertions, 9 deletions

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8ebb3ac85bb9..0363855977f7 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
 
 let
 
@@ -18,18 +18,22 @@ in
 stdenv.mkDerivation rec {
   version = "7.11.20150118";
   name = "ghc-${version}";
+  rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4";
 
-  src = fetchurl {
-    url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2";
-    sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20";
+  src = fetchgit {
+    url = "git://git.haskell.org/ghc.git";
+    inherit rev;
+    sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6";
   };
 
   postUnpack = ''
-    # tarball includes many already-compiled files
-    find . \( -name '*.dyn_o' -o -name '*.dyn_hi' -o -name haddock \) -type f -exec rm {} \;
+    pushd ghc-${builtins.substring 0 7 rev}
+    patchShebangs .
+    ./boot
+    popd
   '';
 
-  buildInputs = [ ghc perl ];
+  buildInputs = [ ghc perl autoconf automake happy alex ];
 
   preConfigure = ''
     echo >mk/build.mk "${buildMK}"
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
new file mode 100644
index 000000000000..3b8f46eb6881
--- /dev/null
+++ b/pkgs/development/compilers/nim/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "nim-0.10.2";
+
+  buildInputs = [ unzip ];
+
+  src = fetchurl {
+    url = "http://nim-lang.org/download/${name}.zip";
+    sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg";
+  };
+
+  buildPhase   = "sh build.sh";
+  installPhase =
+    ''
+      substituteInPlace install.sh --replace '$1/nim' "$out"
+      sh install.sh $out
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Statically typed, imperative programming language";
+      homepage = http://nim-lang.org/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ emery ];
+      platforms = platforms.linux; # arbitrary
+    };
+}
diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix
index a12e8c5ae9da..d19edce2c105 100644
--- a/pkgs/development/compilers/sbcl/1.2.0.nix
+++ b/pkgs/development/compilers/sbcl/1.2.0.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
 
     # Use whatever `cc` the stdenv provides
     substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
+
+    substituteInPlace src/runtime/Config.x86-64-darwin \
+      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
   '';
 
   preBuild = ''
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index ea61940e8d4e..94a17c483aba 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation rec {
 
     # Use whatever `cc` the stdenv provides
     substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
+
+    substituteInPlace src/runtime/Config.x86-64-darwin \
+      --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
   '';
 
   preBuild = ''
diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix
index 4cc07eb7d9d7..78cb850c3565 100644
--- a/pkgs/development/compilers/vala/0.26.nix
+++ b/pkgs/development/compilers/vala/0.26.nix
@@ -4,8 +4,8 @@
 
 let
   major = "0.26";
-  minor = "1";
-  sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b";
+  minor = "2";
+  sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4";
 in
 stdenv.mkDerivation rec {
   name = "vala-${major}.${minor}";