Merge master into x-updates

Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix

pkgs/development/compilers/agda/stdlib-0.8.nix

@@ -1,16 +1,15 @@
 { cabal, fetchurl, filemanip, Agda }:
 
-cabal.mkDerivation (self: {
-  pname = "Agda-lib-ffi";
-  version = "2.4.0";
+cabal.mkDerivation (self: rec {
+  pname = "Agda-stdlib";
+  version = "0.8";
 
   src = fetchurl {
-    url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz";
-    sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf";
+    url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
+    sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78";
   };
 
   buildDepends = [ filemanip Agda ];
-  jailbreak = true;             # otherwise, it complains about base
 
   preConfigure = "cd ffi";
 
@@ -18,7 +17,7 @@ cabal.mkDerivation (self: {
       mkdir -p $out/share
       cd ..
       runhaskell GenerateEverything
-      ${Agda}/bin/agda -i . -i src Everything.agda
+      agda -i . -i src Everything.agda
       cp -pR src $out/share/agda
   '';
 

pkgs/development/compilers/chicken/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "4.9.0";
+  version = "4.9.0.1";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz";
-    sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig";
+    sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4";
   };
 
   buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";

pkgs/development/compilers/cudatoolkit/6.0.nix

@@ -0,0 +1,60 @@
+{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
+, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
+} :
+
+stdenv.mkDerivation rec {
+  name = "cudatoolkit-6.0.37";
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;
+        sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
+      }
+    else throw "cudatoolkit does not support platform ${stdenv.system}";
+
+  outputs = [ "out" "sdk" ];
+
+  buildInputs = [ perl ];
+
+  runtimeDependencies = [
+    ncurses expat python zlib
+    xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
+    gtk2 glib fontconfig freetype unixODBC alsaLib
+  ];
+
+  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
+
+  unpackPhase = ''
+    sh $src --keep --noexec
+    cd pkg/run_files
+    sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec
+    sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec
+    cd pkg
+  '';
+
+  buildPhase = ''
+    find . -type f -executable -exec patchelf \
+      --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      '{}' \; || true
+    find . -type f -exec patchelf \
+      --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+      --force-rpath \
+      '{}' \; || true
+  '';
+
+  installPhase = ''
+    mkdir $out $sdk
+    perl ./install-linux.pl --prefix="$out"
+    rm $out/tools/CUDA_Occupancy_Calculator.xls
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+  '';
+
+  meta = {
+    license = [ "nonfree" ];
+  };
+}
+

pkgs/development/compilers/idris/wrapper.nix

@@ -1,10 +1,10 @@
-{ gmp, makeWrapper, gcc, runCommand, idris_plain}:
+{ gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}:
 
 runCommand "idris-wrapper" {} ''
   source ${makeWrapper}/nix-support/setup-hook
   mkdir -p $out/bin
   ln -s ${idris_plain}/bin/idris $out/bin
       wrapProgram $out/bin/idris \
-        --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \
+        --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
         --suffix PATH : ${gcc}/bin
 ''