Merge branch 'master' into staging

Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix

pkgs/development/mobile/titaniumenv/build-app.nix

@@ -1,7 +1,7 @@
 {stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
 { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
 , enableWirelessDistribution ? false, installURL ? null
 }:
 

pkgs/development/mobile/titaniumenv/default.nix

@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.0.GA"}:
 
 let
   # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@@ -33,6 +33,7 @@ rec {
       else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
       else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
       else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix
+      else if tiVersion == "3.5.0.GA" then ./titaniumsdk-3.5.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {

pkgs/development/mobile/titaniumenv/examples/default.nix

@@ -1,10 +1,10 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "6.0.1"
+, xcodeVersion ? "6.1.1"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "3.4.0.GA"
+, tiVersion ? "3.5.0.GA"
 , rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.0", iosWwdrCertificate ? null
+, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null
 , allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:

pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix

@@ -1,5 +1,5 @@
 { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
-, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.0", iosWwdrCertificate ? null
+, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
 , enableWirelessDistribution ? false, installURL ? null
 }:
 

pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     

pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     

pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     

pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out
     cd $out
-    yes y | unzip $src
+    unzip $src
     
     # Fix shebang header for python scripts
     

pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix

@@ -0,0 +1,77 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-3.5.0.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-linux.zip;
+    sha1 = "c9850d5db29d8fb0c26b114e8c34bb2c91958eed";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/3.5.0/mobilesdk-3.5.0.GA-osx.zip;
+    sha1 = "a5ce74f13da09215b7efa81d626c6e6e83d6dc3b";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    unzip $src
+    
+    # Fix shebang header for python scripts
+    
+    find . -name \*.py | while read i
+    do
+        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+    done
+    
+    # Rename ugly version number
+    cd mobilesdk/*
+    cd 3.5.0.GA
+    
+    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+    # Yes, I know it's nasty :-)
+    
+    cd android
+    
+    sed -i -f ${./fixtiverify.sed} builder.py
+    sed -i -f ${./fixtiprofiler.sed} builder.py
+    sed -i -f ${./fixso.sed} builder.py
+    sed -i -f ${./fixnativelibs.sed} builder.py
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+      ''
+      else ""}
+    
+    # Wrap builder script
+    
+    mv builder.py .builder.py
+    cat > builder.py <<EOF
+    #!${python}/bin/python
+    
+    import os, sys
+    
+    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
+    os.environ['JAVA_HOME'] = '${jdk.home}'
+    
+    os.execv('$(pwd)/.builder.py', sys.argv)
+    EOF
+    
+    chmod +x builder.py
+    
+  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+    
+    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
+  '';
+}

pkgs/development/mobile/xcodeenv/default.nix

@@ -1,4 +1,4 @@
-{stdenv, version ? "6.0.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{stdenv, version ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {