JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,759 Commits 2 Branches 0 Tags 13 GiB
f6f7932a44
Commit Graph

474 Commits

Author SHA1 Message Date
Luca Favatella
3286057969 androidenv: fix default platform-tools to a known one 2020-03-09 04:47:40 +00:00
Luca Favatella
6da0e0b7d7 androidenv: bump emulator version to latest stable - as per Linux 
Move to a known version of the emulator.  Each OS has a distinct
version... pick the one on Linux.  A better solution would be to let
the user of `emulateApp` overload what the emulator version shall be
(and maybe it is already possible and I do not see it) - without need
to reproduce large portions of `default.nix`.

Using the previous emulator showed the following warning:
```
Your emulator is out of date, please update by launching Android Studio:
```

I am not aware of any reasons for not wanting the latest emulator (as
I expect it shall be compatible usually with more system images - not
less), so bump its default version.

Emulator release notes:
https://developer.android.com/studio/releases/emulator
 2020-03-09 04:47:40 +00:00
Luca Favatella
e003ca046c androidenv: update the generated expressions 
... running `generate.sh`.
 2020-03-09 04:47:39 +00:00
Luca Favatella
de119ca8ea androidenv: fix packages xsl used in generate.sh 
Entry `<remotePackage path="cmdline-tools;latest">` resulted in a
duplicated `"cmdline-tools"."1.0"`.
 2020-03-09 04:45:36 +00:00
Tad Fisher
d574ea45a2 androidenv: fix system images xsl used in generate.sh 
Updated with fixes for `convertsystemimages.xsl`:
- Use `type-details/codename` if it exists, falling back to
  `type-details/api-level`: this results in "Q" rather than "28" for
  preview images
- Use `<xsl:text>` elements to control whitespace in the output.

This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
 2020-03-09 03:43:19 +00:00
Tad Fisher
6f80983963 androidenv: update generate.sh to use nix-shell and fail on error 
Update generate.sh to run using nix-shell. Also make it fail with
meaningful output instead of writing empty output files.

This is extracted from https://github.com/NixOS/nixpkgs PR 58131.

This relies on the shebang being used.
 2020-03-09 03:43:19 +00:00
Sander van der Burg
d0bf2ff810 titaniumenv: add Titanium SDK 8.3 2020-03-01 20:23:39 +01:00
Sander van der Burg
3deb1caa82 androidenv: add platform SDK 29 2020-03-01 20:23:39 +01:00
Lily Ballard
c0af0c4763 cocoapods-beta: 1.9.0.beta.3 -> 1.9.0 2020-02-26 23:56:46 -08:00
Lily Ballard
915a3aa437 cocoapods: 1.8.4 -> 1.9.0 2020-02-26 23:56:34 -08:00
Lenz Weber
5ef31532b1 androidenv build-tools: fix old versions under linux 2020-02-14 11:41:57 +01:00
Lily Ballard
178480ad2d cocoapods-beta: 1.9.0.beta.2 -> 1.9.0.beta.3 2020-02-07 16:25:53 -08:00
Aaron Andersen
526aec7ba7
Merge pull request #75841 from lilyball/cocoapods-beta 
cocoapods-beta: 1.9.0.beta.1 -> 1.9.0.beta.2
 2020-01-11 09:24:56 -05:00
Hernawan Faïz Abdillah
82a2a9eabf
androidenv.lldb: Fix libssl not found 2020-01-07 14:02:13 +07:00
Robin Gloster
760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Lily Ballard
d440cea907 cocoapods-beta: 1.9.0.beta.1 -> 1.9.0.beta.2 2019-12-17 14:32:10 -08:00
Lily Ballard
ab9bdca091 cocoapods-beta: 1.8.4 -> 1.9.0.beta.1 2019-12-16 16:15:34 -08:00
Kirill Elagin
2e79c2d969 android: Install platform-tools binaries on all OSes 2019-11-19 22:29:21 +01:00
Jamey Sharp
5d1c9cebd6 deployAndroidPackage: prefer local builds 
These derivations just unzip something and maybe do a little patching,
so there's no benefit to sending the zip file off to a build server and
then downloading the unzipped results again.
 2019-11-16 14:37:47 +01:00
Sander van der Burg
173bf3473c titaniumenv: remove 7.1, add 8.2 and make it the default 2019-11-11 08:50:27 +01:00
Sander van der Burg
9b51c5145a xcodeenv: bump default Xcode version to 11.1, default iOS SDK to 13.1. Add troubleshooting section to docs 2019-11-11 00:18:22 +01:00
Lily Ballard
8c15284aeb cocoapods-beta: 1.8.1 -> 1.8.4 2019-10-19 00:08:02 -07:00
Lily Ballard
cfb0c10d83 cocoapods: 1.8.1 -> 1.8.4 2019-10-19 00:08:02 -07:00
Lily Ballard
8d44be3041 cocoapods-beta: 1.8.0.beta.2 -> 1.8.1 2019-09-27 22:12:58 -07:00
Lily Ballard
d377c1e1b5 cocoapods: 1.7.5 -> 1.8.1 2019-09-27 22:12:58 -07:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329 Merge master into staging-next 2019-08-31 18:04:31 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Lily Ballard
7046208131 cocoapods-beta: 1.8.0.beta.1 -> 1.8.0.beta.2 2019-08-27 11:27:03 -07:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Robin Gloster
0511b88ccb
xpwn: bump to commit including openssl 1.1 support 2019-08-21 19:14:01 +02:00
Matthew Bauer
5be571eea1
Merge pull request #66747 from erikarvstedt/androidenv-fixes 
Androidenv fixes
 2019-08-20 13:38:01 -04:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Erik Arvstedt
1b81302d49
androidenv: rename stdenv.lib -> lib 
Removes some visual clutter.
 2019-08-17 11:19:06 +02:00
Erik Arvstedt
2ec43d3509
androidenv/emulate-app: rename androidsdkComposition -> sdk 
This greatly improves readability by shortening some of the overlong lines.
 2019-08-17 11:19:05 +02:00
Erik Arvstedt
0dab612395
androidenv/emulate-app: fix passing extra args to the sdk composition 
This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
 2019-08-17 11:19:02 +02:00
Erik Arvstedt
e48d97f640
androidenv: fix deployment of google_apis* system images 
Fixes #56866
 2019-08-17 11:18:59 +02:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Lily Ballard
261691c4b4 cocoapods-beta: 1.7.5 -> 1.8.0.beta.1 2019-08-06 23:32:13 -07:00
adisbladis
9e9c6de50c
nodejs-8_x: Drop package 
It will be EOL within the support period of 19.09
 2019-08-02 02:34:47 +02:00
Lily Ballard
33d9cd6a93 cocoapods-beta: 1.7.4 -> 1.7.5 2019-07-19 11:44:45 -07:00
Lily Ballard
107583bdfa cocoapods: 1.7.4 -> 1.7.5 2019-07-19 11:44:38 -07:00
Lily Ballard
11b8159328 cocoapods-beta: 1.7.3 -> 1.7.4 2019-07-10 13:04:14 +02:00
Lily Ballard
b179b1d7e0 cocoapods: 1.7.3 -> 1.7.4 2019-07-10 13:04:14 +02:00
adisbladis
d614edeb32
Revert Nodejs-8_x deprecation 
This was supposed to go through a pull request

Revert "nodePackages: Regenerate node packages for nodejs 10 & 12"
This reverts commit 6a17bdf397.

Revert "nodejs-8_x: Drop package"
This reverts commit e06c97b71d.
 2019-07-05 12:23:27 +01:00
adisbladis
e06c97b71d
nodejs-8_x: Drop package 
It will be EOL within the support period of 19.09
 2019-07-05 12:21:42 +01:00
Lily Ballard
9ad722a0b3 cocoapods-beta: 1.7.2 -> 1.7.3 2019-07-01 00:43:23 -07:00
Lily Ballard
e005936274 cocoapods: 1.7.2 -> 1.7.3 2019-07-01 00:43:12 -07:00
volth
f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Frederik Rietdijk
9bd6c5d817
Merge staging-next into master 2019-06-15 10:46:55 +02:00
Lily Ballard
96d79aff40 cocoapods: 1.7.1 -> 1.7.2 
Also update cocoapods-beta to match.
 2019-06-15 10:31:10 +02:00
Matthew Bauer
dc42372809
Merge pull request #61168 from matthewbauer/release-cross-fixes 
release-cross.nix changes/fixes
 2019-06-03 20:13:43 -04:00
Matthew Bauer
8b2b0f7413
Merge pull request #61906 from lilyball/cocoapods 
cocoapods: 1.6.2 -> 1.7.1
 2019-05-31 21:51:25 -04:00
Lily Ballard
0f9c140b5d cocoapods-beta: 1.7.0.rc.2 -> 1.7.1 2019-05-30 12:39:52 -07:00
Lily Ballard
71f01b19d0 cocoapods: 1.6.2 -> 1.7.1 2019-05-30 12:39:39 -07:00
Alex Ameen
4b46acd498 genymotion: refactor src from requireFile to fetchurl 
The old src url was updated by the host, making the required file inaccessible. The new url links directly to the required file. This direct link allows us to use fetchurl rather than requireFile.

genymotion: refactor src url

Fixed revisions:
1) Uses `pname`.
2) URL uses version variable in path. Data type for `url` was changed from path to string.

genymotion: refactor src url

Removed redundant `name` definition.

fixed typo in URL

changed requireFile to fetchurl
 2019-05-28 15:25:59 -05:00
Silvan Mosberger
2440863b17
Merge pull request #61934 from lilyball/cocoapods-update-script 
cocoapods: define updateScript
 2019-05-24 15:24:39 +02:00
edef
c89b2de425 androidenv: fix the $out/bin symlink for ndk-bundle 2019-05-24 02:32:14 +00:00
Lily Ballard
6d81ca80ad cocoapods: define updateScript 2019-05-23 10:56:01 -07:00
Lily Ballard
ffd371164f cocoapods-beta: 1.7.0.rc.1 -> 1.7.0.rc.2 2019-05-15 13:02:02 -07:00
Lily Ballard
aba46ce144 cocoapods: 1.6.1 -> 1.6.2 2019-05-15 11:53:46 -07:00
Matthew Bauer
4acc434847 androidenv: add more context to os not found error 
We don’t have android sdk available for aarch64, so this error happens
a lot. Adding some context on what is going on makes this clearer.
 2019-05-08 21:45:33 -04:00
Lily Ballard
e0214127c7 cocoapods-beta: 1.7.0.beta.3 -> 1.7.0.rc.1 2019-05-02 13:36:28 -07:00
Lily Ballard
ae22f7d35c cocoapods-beta: init at 1.7.0.beta.3 
cocoapods-beta is an alternative attribute for the cocoapods package
that provides the latest beta instead of the stable version.

Also switch to `bundlerApp` so we stop polluting the profile with our
gem dependencies and can get rid of the broken `sandbox-pod` executable.
 2019-04-16 20:50:56 -07:00
Sander van der Burg
907c478ceb titaniumenv: fix stripping the unneeded architectures 2019-03-10 23:18:08 +01:00
Sander van der Burg
041b40105c titaniumenv: fix deriving path to the IPA file 2019-02-23 14:57:49 +01:00
Lily Ballard
eed0ee0c16 cocoapods: 1.6.0 -> 1.6.1 2019-02-22 11:49:54 -08:00
Jörg Thalheim
1c349cb262
Merge pull request #55471 from lilyball/cocoapods_1.6.0 
cocoapods: 1.5.3 -> 1.6.0
 2019-02-22 09:56:44 +00:00
Sander van der Burg
f3294b93ec xcodeenv: fix generation of ad-hoc wireless installation page 2019-02-21 21:42:05 +01:00
Sander van der Burg
b72070959a xcodeenv: do not rename bundleId to lowercase 2019-02-21 21:17:15 +01:00
Lily Ballard
51edcce46c cocoapods: 1.5.3 -> 1.6.0 
Fixes #55458.
Fixes #55461.
 2019-02-10 20:03:00 -08:00
Sander van der Burg
7a8b65d216 titaniumenv: fix broken function header 2019-02-04 23:07:04 +01:00
Sander van der Burg
8cec070f8c titaniumenv: add Xcode 10.1 and Titanium 7.5.1 support 2019-02-04 22:50:36 +01:00
Sander van der Burg
9edc2d4dbb xcodeenv: enable Xcode 10.1 support 2019-02-04 22:43:48 +01:00
Jan Malakhovski
32e854c156 androidenv: move defaults to package file 2019-02-03 15:33:21 +00:00
Matthew Bauer
9c770c4efa androidenv: move licenseAccepted condition to androidsdk 
The NDK can be built without accepting the license.
 2019-01-29 21:13:41 -05:00
Sander van der Burg
287e92ad47 androidenv: Remove unused patch 2019-01-26 23:17:30 +01:00
Sander van der Burg
9130c1d592 androidsdk: fix missing fontconfig library reference when tools version 26.1.x is used 2019-01-26 21:35:18 +01:00
Sander van der Burg
3bfd3e73bf Reintroduce licenseAccepted option 2018-12-18 21:16:07 +01:00
Sander van der Burg
b99ac1c904 Remove redundant getBin function 2018-12-18 21:16:07 +01:00
Sander van der Burg
5e690b47fd adb-sync: fix to make it work with platform-tools 2018-12-18 21:16:07 +01:00
Sander van der Burg
074c7e99e0 Fix standalone generation script 2018-12-18 21:16:07 +01:00
Sander van der Burg
cb42643b95 Fix inclusion of sources 2018-12-18 21:16:07 +01:00
Sander van der Burg
53550c826d Port packages with Android dependencies to new androidenv 2018-12-18 21:16:06 +01:00
Sander van der Burg
27f8b6b89e Replace titaniumenv with new implementation 2018-12-18 21:16:06 +01:00
Sander van der Burg
907216a57d Replace xcodeenv with new implementation 2018-12-18 21:16:06 +01:00
Sander van der Burg
74750dc67d Replace androidenv by new implementation 2018-12-18 21:16:06 +01:00
Sander van der Burg
2757ddb182 Separate androidndkpkgs from androidenv 2018-12-18 21:14:43 +01:00
Bastian Köcher
cf2d35d889 androidndk: Adds missing patch for 18b 2018-12-16 10:45:42 +01:00
Bastian Köcher
bf44d81df9 androidndk: 17c -> 18b 2018-11-20 11:21:42 +01:00
Clemens Fruhwirth
b4d9f6ddca androidsdk: Re-add emulator that was broken out of the sdk-tools package. 2018-11-12 13:06:22 -04:00
David McFarland
c43abffb9c androidsdk: fix monitor interpreter path 2018-11-10 15:23:11 -04:00
Matthew Bauer
21eeb00a08 treewide: get rid of osx cmake flags 
Flags that we now set globally:

- CMAKE_OSX_SYSROOT
- CMAKE_OSX_DEPLOYMENT_TARGET

can now be removed.

(cherry picked from commit 8742d5de30dfe2447c0fb56a2e7410b402effc80)
 2018-11-05 13:30:42 -06:00
Nick Novitski
d861da151f androidenv: version buildTools and add buildToolsVersions sdk argument 2018-10-26 22:09:47 -07:00
Nick Novitski
4a0ae5d7d6 androidenv: add androidsdk_{8_1,9_0}{,_extras} 2018-10-26 20:45:52 -07:00
Nick Novitski
a61f31cf23 androidenv: run ./fetch.sh 
Manually corrected three problems:
- fetch.sh: android cli cannot find java executable
- addons.nix: google_apis_25 expression not added correctly
- addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
 2018-10-26 20:45:51 -07:00