public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent 'staging' into closure-size

Browse Source 
Let's get rid of those merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-02-03 16:57:19 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/titaniumenv/build-app.nix
-5
View File
@@ -51,11 +51,6 @@ stdenv.mkDerivation {
''
titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-*
titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1
titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.path ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*
titanium config --config-file $TMPDIR/config.json android.executables.zipalign ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/zipalign
titanium config --config-file $TMPDIR/config.json android.executables.aapt ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aapt
titanium config --config-file $TMPDIR/config.json android.executables.aidl ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aidl
titanium config --config-file $TMPDIR/config.json android.executables.dx ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/dx
export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH
pkgs/development/mobile/titaniumenv/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.1.GA"}:
{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.2.GA"}:
rec {
androidenv = pkgs.androidenv;
@@ -9,7 +9,7 @@ rec {
} else null;
titaniumsdk = let
titaniumSdkFile = if tiVersion == "5.1.1.GA" then ./titaniumsdk-5.1.nix
titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix
else throw "Titanium version not supported: "+tiVersion;
in
import titaniumSdkFile {
pkgs/development/mobile/titaniumenv/examples/default.nix
+3 -3
View File
@@ -2,9 +2,9 @@
, systems ? [ "x86_64-linux" "x86_64-darwin" ]
, xcodeVersion ? "7.2"
, xcodeBaseDir ? "/Applications/Xcode.app"
, tiVersion ? "5.1.1.GA"
, tiVersion ? "5.1.2.GA"
, rename ? false
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2", iosWwdrCertificate ? null
, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
, allowUnfree ? false
, enableWirelessDistribution ? false, installURL ? null
}:
@@ -84,7 +84,7 @@ rec {
inherit tiVersion;
release = true;
rename = true;
inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate;
inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
inherit enableWirelessDistribution installURL;
};
}
pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.1.GA", release ? false
{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false
, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1"
, enableWirelessDistribution ? false, installURL ? null
}: