nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-06 13:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
578,999 Commits 170 Branches 125 Tags 6.5 GiB
962b4c436e
Commit Graph

653 Commits

Author SHA1 Message Date
John Ericson
4c489b5f5d deployAndroidPackage: Use pname and version 2020-09-08 09:31:18 -04:00
Matthew Bauer
d0e52b6b32
Merge pull request #95309 from obsidiansystems/mobile-fixes 
Support Android 29 in cross-compilation
 2020-08-28 14:59:37 -05:00
eyjhb
f13d952121
androidenv: fix convert files not quoting urls 2020-08-19 16:40:28 +02:00
Matthew Bauer
4cbca0893a androidenv: remove duplicate addons.nix entries 2020-08-17 23:51:59 -05:00
Matthew Bauer
074bc78cc8 android: update sdk, ndk to 29, 21 2020-08-17 23:51:53 -05:00
Luca Favatella
7802608649 androidenv/emulate-app: use runtimeShell instead of stdenv.shell 
See also https://github.com/NixOS/nixpkgs PR 56408.
 2020-08-16 10:27:37 +00:00
Lily Ballard
b02225db76 cocoapods-beta: 1.10.0.beta.1 -> 1.10.0.beta.2 2020-08-12 13:27:20 -07:00
eyjhb
2d999d7e6e
androidenv.build-tools: add libc++ to enable buildToolsVersion 29.0.3 2020-08-01 16:53:51 +02:00
Lily Ballard
c4ce0b778c cocoapods-beta: 1.9.3 -> 1.10.0.beta.1 2020-07-26 23:19:30 -07:00
Maximilian Bosch
4f67c0cc6c
adb-sync: 2016-08-31 -> 2019-01-01 
Simple tool to synchronize a directory-tree between a local machine and
an Android device using `adb` and `rsync`.

Since this repo doesn't have any releases atm, I added the `-unstable`
suffix to `pname`. Since 2016-08-31 the following things changed:

7fc48ad1e1...fb7c549753

Also applied the following changes to the derivation:

* Removed the `phases` hack to enable important things like `fixupPhase`
  again (amongst other things this is needed for shebang-patching and
  reference-checks).

* Fixed the wrapper to make sure that every binary needed by those
  scripts is available.

* Added myself as additional maintainer.
 2020-06-10 01:40:29 +02:00
Lily Ballard
9a11cd674e cocoapods-beta: 1.9.2 -> 1.9.3 2020-05-30 14:17:09 -07:00
Lily Ballard
8cc640b5cb cocoapods: 1.9.2 -> 1.9.3 2020-05-30 14:17:01 -07:00
vponte
7d69a04d79 androidenv: add missing emulator dynamic libraries 2020-05-30 15:43:32 +02:00
Jörg Thalheim
6602f87384
nodePackages: switch to 12 
Signed-off-by: Christian Albrecht <christian.albrecht@mayflower.de>
 2020-05-27 21:45:41 +02:00
Lily Ballard
30c5973f46 cocoapods-beta: 1.9.1 -> 1.9.2 2020-05-22 17:15:27 -07:00
Lily Ballard
c364ed710f cocoapods: 1.9.1 -> 1.9.2 2020-05-22 17:15:16 -07:00
Jan Tojnar
e89e2edc73
libusb-compat-0_1: rename from libusb 2020-04-28 05:33:41 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Samuel Leathers
72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4 
bundler: 1.17.3 -> 2.1.4
 2020-04-08 12:44:54 -04:00
Michael Fellinger
f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Sander van der Burg
542a74a9dc
Merge pull request #82118 from lucafavatella/androidenv-update-2 
androidenv: update generated expressions
 2020-04-05 14:59:04 +02:00
Sander van der Burg
52c89d0572
Merge pull request #82067 from lucafavatella/androidenv-generate 
androidenv: enhance script for the generated expressions
 2020-03-16 22:48:17 +01:00
Lily Ballard
3635332a42 cocoapods-beta: 1.9.0 -> 1.9.1 2020-03-15 17:58:19 -07:00
Lily Ballard
7e678381ce cocoapods: 1.9.0 -> 1.9.1 2020-03-15 17:58:08 -07:00
Luca Favatella
f01278dea2 androidenv: manually (!) delete more complex version of google images 
This commit was built as a revert commit followed by deletion:
* Revert "androidenv: manually (!) delete oldest revision of google
  images".
* Delete other revision.

Using `systemImageType = "google_apis_playstore"` (and `abiVersion =
"x86"` and `platformVersion = "28"` - that I expect resolved to
`97d9d4f4a2afa8b0f5d52e90748e19c10406ca93`), the symptom is:
```
Warning: Observed package id 'system-images;android-28;google_ndk_playstore;x86' in inconsistent location '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_apis_playstore/x86' (Expected '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_ndk_playstore/x86')
...
Error: Package path is not valid. Valid system image paths are:
system-images;android-28;google_ndk_playstore;x86
```
How is the actual image name `google_ndk_playstore` when the fetched
image has id `google_apis_playstore`?

Attempt keeping - of the two images - the one that looks simpler.

For the `"28".google_apis."x86"` images, in the XML the differences
are: more complex license (what is `arm-dbt`?); higher emulator.
Namely:
```
		<uses-license ref="android-sdk-license"/>
		<dependencies>
			<dependency path="patcher;v4"/>
			<dependency path="emulator">
				<min-revision>
					<major>27</major>
					<minor>1</minor>
					<micro>7</micro>
...
		<uses-license ref="android-sdk-arm-dbt-license"/>
		<dependencies>
			<dependency path="patcher;v4"/>
			<dependency path="emulator">
				<min-revision>
					<major>29</major>
					<minor>1</minor>
					<micro>12</micro>
```

Analogously for `"28".google_apis_playstore."x86"`.
 2020-03-09 18:34:16 +00:00
Luca Favatella
c50618898f androidenv/emulate-app: fix image id for recent device manager 
Symptom:
```
Available Android targets:
----------
id: 1 or "android-28"
     Name: Android 9
     Type: Platform
     API level: 28
     Revision: 6
     Skins: HVGA, QVGA, WQVGA400, WQVGA432, WSVGA, WVGA800 (default), WVGA854, WXGA720, WXGA800, WXGA800-7in
 Tag/ABIs : google_ndk_playstore/x86
...
Error: Invalid --tag google_apis_playstore for the selected target.
```

For creation of AVD, switch from `android` to `avdmanager` as the
latter seems enabling selecting the image with less friction (and is
better documented as not deprecated).  This requires using recent
tools - from https://developer.android.com/studio/releases/sdk-tools :
> SDK Tools, Revision 25.3.0 (March 2017)
> ...
> `android avd` command-line functionality replaced with new
> `avdmanager` tool.

For listing of targets, switch from `android` to `avdmanager` as the
`android` command invocation fails in recent tools.  Symptom (not
missing `s` as backward incompatibility):
```
Invalid or unsupported command "list targets"

Supported commands are:
android list target
android list avd
android list device
android create avd
android move avd
android delete avd
android list sdk
android update sdk
```

References:
- https://developer.android.com/studio/tools/help/android
- https://developer.android.com/studio/command-line/avdmanager
 2020-03-09 15:38:49 +00:00
Freeman Latif
954b406ac2 androidenv: add missing linux dependencies 
This is extracted from https://github.com/NixOS/nixpkgs PR 78623.

The symptom I observed was:
```
builder for '/nix/store/7zz585ch9jqjvz8k88rf7fs046inxszq-emulator-30.0.3.drv' failed with exit code 1; last 10 log lines:
    libXext.so.6 -> found: /nix/store/qkmj8pa3ka9v335bbgx74ah4080fwdbf-libXext-1.3.4/lib/libXext.so.6
    libXfixes.so.3 -> found: /nix/store/nhp59xxq4g51mgpwgjsp8pvkn7531b86-libXfixes-5.0.3/lib/libXfixes.so.3
    libXi.so.6 -> not found!
    libXrender.so.1 -> not found!
    libXtst.so.6 -> not found!
    libasound.so.2 -> not found!
    libz.so.1 -> found: /nix/store/pb2am7dfsv524pb2z7m8mp8nkcmgd3cl-zlib-1.2.11/lib/libz.so.1
    libdbus-1.so.3 -> found: /nix/store/ddqrvb1b0xdb8g18f4advmq4wk0aiknd-dbus-1.12.16-lib/lib/libdbus-1.so.3
    libGL.so.1 -> found: /nix/store/bbpgyifsh2hv0ivhl3g4ik2nw7d10zdx-emulator-30.0.3/libexec/android-sdk/emulator/lib64/gles_mesa/libGL.so.1
    libc++.so.1 -> found: /nix/store/bbpgyifsh2hv0ivhl3g4ik2nw7d10zdx-emulator-30.0.3/libexec/android-sdk/emulator/lib64/libc++.so.1
```
 2020-03-09 04:49:47 +00:00
Luca Favatella
91411f0f21 androidenv: manually (!) delete default images with same name 
... complex as apparently dependent on OS of host of emulator.

This shall rather be solved by enhancement of the scripts.
 2020-03-09 04:47:40 +00:00
Luca Favatella
72e3836bfb androidenv: manually (!) delete oldest revision of google images 
... as same name hence clashing.

This shall rather be solved by enhancement of the scripts.
 2020-03-09 04:47:40 +00:00
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
Nick Novitski
6e07691ed7 androidenv: remove android command from fetch.sh 
It's deprecated, and no longer prints the urls of any xml files for the script
to parse.
 2018-10-26 20:45:51 -07:00
Nick Novitski
ec8f320797 androidenv.androidndk: patch prebuilt 64bit binaries 2018-10-26 20:45:51 -07:00
Nick Novitski
f5c2960a11 androidenv.buildTools: patch hard-coded /bin/ls paths 2018-10-26 20:45:40 -07:00
Nick Novitski
ad501e4c2f androidenv.buildtools: 28.0.2 -> 28.0.3 2018-10-25 11:56:47 -07:00
Nick Novitski
950608bae0 androidsdk: 25.2.5 -> 26.1.1, license agreement 2018-10-25 11:56:47 -07:00
Matthew Bauer
deee27973e
Merge pull request #46720 from baldo/android-platform-tools 
android-platform-tools: 26.0.2 -> 28.0.1
 2018-10-05 22:42:30 -05:00
Lionello Lunesu
132ed23f35
xcodeenv.buildApp: inherit meta 
Without `inherit meta;` there was no easy way for XCode packages to
set meta information of the final derivation.
 2018-10-02 12:01:22 +08:00
John Ericson
226d574870 Merge remote-tracking branch 'upstream/master' into darwin-android-ndk-for-master 2018-09-17 22:48:25 -04:00
John Ericson
6769437186 androidndk: Add Darwin support 
Also switch Linux to using the official sha1 hashes for consistency.
They are gotten from https://developer.android.com/ndk/downloads/.
 2018-09-17 22:34:37 -04:00
Andreas Baldeau
1de1bc8038 android-platform-tools: patchelf also binaries new in 28.0.1. 2018-09-16 00:29:46 +02:00
Andreas Baldeau
906e69d638 android-platform-tools: 26.0.2 -> 28.0.1 2018-09-15 23:29:20 +02:00
Bastian Köcher
dd0b3dafc9 androidndk: Add makeStandaloneToolchain support 
Example:
```
let
  toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64");
in
...
```
 2018-09-07 22:03:26 +02:00
Bastian Köcher
48bdf31f58 androidndk: Fix make_standalone_toolchain.py 
Python path needs to be absolute and the generated scripts will use also
an absolute path to `bash`.
 2018-09-07 21:42:49 +02:00
Shea Levy
18337f3ece
Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
Luigy Leon
c759f7a9b7 androidndk: fix eval 
fixup from https://github.com/NixOS/nixpkgs/pull/45820

/cc @Ericson2314
 2018-09-01 19:40:52 -04:00
Jörg Thalheim
b0155aa1e7
Merge pull request #45842 from Kaali/master 
cocoapods: 1.5.0 -> 1.5.3
 2018-09-01 11:25:26 +01:00
Väinö Järvelä
48abc2a788 cocoapods: 1.5.0 -> 1.5.3 2018-08-31 07:22:46 +03:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff 
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
 2018-08-30 17:20:32 -04:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
Matthew Bauer
4a5cbdf5ea android: add licenses 
androidndk is apache 2.0
androidsdk is unfree
 2018-08-06 10:15:49 -04:00
Robert Schütz
0cd86e1e9d
adb-sync: use python3 (#44409) 
According to https://github.com/google/adb-sync/pull/2#commitcomment-11399661,
it should work with python2 and python3. Using python3 is prefered in nixpkgs.
 2018-08-03 19:48:42 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Bastian Köcher
ea475c1da5 androidndk: Use callPackage to support overriding the fullNdk option 2018-07-10 09:09:34 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
Matthew Bauer
e3475f3406
build-gradle-app.nix: fix eval 
Sorry, typo.
 2018-06-27 13:30:16 -04:00
Matthew Bauer
0d9112f01a
build-gradle-app.nix: mark unfree 
Forgot about this. It needs android-sdk-license & build products should fail when allowUnfree = false.
 2018-06-27 13:29:55 -04:00
Matthew Bauer
5000cc555e android: define __ANDROID_API__ in cflags 
This is needed for targeting older apis.
 2018-06-25 17:12:52 -04:00
Matthew Bauer
d9155904b3 androidndk: add fullNDK option 
Setting this to true will disable removing some of the unused parts of
the NDK toolchain that is unused in Nixpkgs but may be used by others.

/cc @bkchr
 2018-06-25 17:10:11 -04:00
Matthew Bauer
7652b2ef16 android: add --build-id to ldflags 
the gcc in android does not have this on by default. Doing this will
fix some of the errors in cross-trunk:

https://hydra.nixos.org/build/76354538/nixlog/11

This is related to how separate debug info is handled in Nixpkgs.
 2018-06-25 17:10:11 -04:00
Matthew Bauer
37aab4cbb5 android: more output size reduction 
This should bring us finally under the 2G max. llvm directory was
missing from my last commit.
 2018-06-22 19:06:11 -04:00
Matthew Bauer
e1e9b197f9 android: fix from last output size reduction 
Directories weren’t being removed properly.
 2018-06-22 17:49:28 -04:00
John Ericson
bbef861e0f
Merge pull request #42397 from obsidiansystems/more-android-fixes 
androidndk: cleanups
 2018-06-22 17:17:53 -04:00
Matthew Bauer
7b49d3b335 androidndk: fix eval 2018-06-22 16:51:22 -04:00
Matthew Bauer
054656a2fc androidndk: reduce output sizw 
Fixes #41704
 2018-06-22 16:48:26 -04:00
Matthew Bauer
a7fc8ad140 androidndk: use unzip 
This is a free version and preferred to 7zip.
 2018-06-22 16:41:08 -04:00
Matthew Bauer
e5d262e1cc androidndk: fixup 2018-06-22 16:32:05 -04:00
Matthew Bauer
c8fd285c8d android: add ndkVer to resolve ndk ambiguity 
It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
 2018-06-22 11:06:17 -04:00
Matthew Bauer
cf09ffe9aa android: Use NDK 17 for aarch32 2018-06-22 09:33:25 -04:00
Matthew Justin Bauer
ec2ea29716
Merge pull request #41855 from obsidiansystems/gradle-app 
init androidenv.buildGradleApp
 2018-06-21 17:45:23 -04:00
Matthew Bauer
2a0c328712 androidenv: add "androidsdk_latest" for latest sdk 
This is easier than having to remember which SDKs are supported, etc.
Stuff based on this can become more future-proof.
 2018-06-21 16:09:11 -04:00
Matthew Bauer
b72da4bee8 androidenv.buildGradleApp: refactor 2018-06-21 15:57:56 -04:00
Matthew Bauer
2e8feba171 androidenv: Use fetchzip instead of googlerepository 2018-06-21 12:12:31 -04:00
Matthew Bauer
dfa2895181 androidndk: fixup asm linking 
This fixes cross compiling to android that is currently broken. The
asm symlink needs to be set on versions /newer/ than 10e not the other
way around. We also need to use hostInfo’s triple here because ...

/cc @ericson2314 @bkchr
 2018-06-13 20:31:33 -04:00
Ryan Trinkle
fe04fe868b Fix gradle build 2018-06-11 13:25:54 -04:00
Ali Abrar
abddf4ab83 Don't append signingConfigs to build.gradle 2018-06-11 13:25:47 -04:00
Ali Abrar
465e3a01d4 Add android sdk license acceptance 2018-06-11 13:25:41 -04:00
Ali Abrar
1cc64da8d4 add signing to buildGradleApp 2018-06-11 13:25:34 -04:00
Ali Abrar
62b59e5353 Add buildGradleApp to androidenv 2018-06-11 13:25:27 -04:00
Matthew Justin Bauer
673628e10c
androidndk: remove set -x 
This was causing output limit exceeded in Hydra:

https://hydra.nixos.org/build/75406916
 2018-06-07 17:04:08 -04:00
Bastian Köcher
495c5a2291 androidndk: Fixes missing libraries for prebuilt clang 2018-05-25 17:32:34 +02:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath. 
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
 2018-05-22 16:42:02 -04:00
Bastian Köcher
832a8ca087 androidndk: Fix usage as crossSystem 2018-05-17 17:22:27 +02:00
Bastian Köcher
c056694d74 androidndk: Adds versions 17 and 16b 2018-05-17 13:18:05 +02:00
Bastian Köcher
9f79ac6f3b androidndk: Drop 32bit support 2018-05-15 16:58:37 +02:00
John Ericson
92b7a814f2 Merge branch 'fix-gcc-with-float' 2018-05-12 15:21:30 -04:00
John Ericson
f2004e6287 lib: Fix float handling for Aarch32 
Forgot to adjust default so abi with explicit float attr would be used.
 2018-05-12 15:18:31 -04:00
John Ericson
6f40d18d44 prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a 
(cherry picked from commit 827ef09140)
 2018-05-12 15:16:16 -04:00
John Ericson
827ef09140 prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a 2018-05-11 19:17:35 -04:00
Ruben Maher
18f4abb0ad cocoapods: 1.3.1 -> 1.5.0 2018-05-10 09:53:58 +09:30
Alexandre Esteves
85b5fc7c98 xcodeenv: fix typo 2018-05-06 21:34:05 +00:00
Matthew Bauer
143978a477 treewide: remove platform assertions 
linux: readd assertion
 2018-05-03 13:09:20 -05:00
Florian Klink
1b4027c6fc abootimg: init at 0.6 2018-04-23 14:09:41 +02:00
Peter Romfeld
f5b3f9962e cocoapods: init at 1.3.1 (#32583) 
* cocoapods: init at 1.3.1

* requires xcode
 2018-04-21 14:37:56 -05:00
Matthew Justin Bauer
d30f7a5aa8
Merge pull request #36911 from rasendubi/android-build-tools 
androidenv.buildTools: 26.0.1 -> 26.0.2
 2018-04-17 10:26:11 -05:00
Nikolay Amiantov
6bf1421f13 treewide: refactor to use libglvnd 
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
 2018-03-26 14:01:49 +03:00
Sander van der Burg
112ebed491 xcodeenv: publish xcarchive directory in the output store path if requested 2018-03-22 15:02:09 +01:00
Sander van der Burg
f2bd9d4745 xcodeenv: replace deprecated package application procedure by the new export archive operation 2018-03-22 14:33:15 +01:00
Sander van der Burg
479ec3d888 titaniumenv: fix renaming strategy 2018-03-21 16:08:56 +01:00
Sander van der Burg
603556085b titaniumenv: update example app 2018-03-21 15:51:07 +01:00
Sander van der Burg
4beb695ece titaniumenv: fix Android signing on darwin 2018-03-21 14:57:57 +01:00
Sander van der Burg
5532cc1641 titaniumenv: remove obsolete java fix wrapper on darwin 2018-03-20 17:39:45 +01:00
Sander van der Burg
e8e7e78d9f titaniumenv: add 7.1 SDK and make it the default 2018-03-20 17:22:32 +01:00
Alexey Shmalko
6ef19f8e97
androidenv.buildTools: 26.0.1 -> 26.0.2 2018-03-13 18:15:44 +02:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
John Ericson
2482e2858e prebuilt android tools: Init using SDK 
Expose as an option for the cross stdenv.
 2018-02-27 14:15:39 -05:00
Yegor Timoshenko
40a63aa999 imgpatchtools: init at 0.3 2018-02-25 16:49:23 +00:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
John Ericson
7748972763 androidenv: Better platform conditionals 2018-02-24 01:43:10 -05:00
John Ericson
fe5ae8b550 androidenv: Clean up whitespace 2018-02-24 01:43:10 -05:00
Will Dietz
e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Profpatsch
53e790e7a8 maintainers: capitalize the Profpatsch attribute (vanity) 
Since I’m already at it, this has been bothering me for a while.
 2018-02-12 07:24:50 +01:00
Will Dietz
5dc6306e9c xpwn: build usb-based tools by replacing libusb1 dep with libusb 
Otherwise the build fails to detect libusb and doesn't build
the 'xpwn' and 'dfu-util' tools.

New tools run but I don't have any suitable devices to test :).

(I believe latest iGadgets need a newer version of xpwn anyway)
 2018-02-01 14:15:02 -06:00
Sander van der Burg
0d7a0d7572 titaniumenv: fix nasty IPA generation bug 2018-01-31 18:56:47 +01:00
Sander van der Burg
fe6510369d titaniumenv: add parameter that specifies than an IPA build is a store build 2018-01-31 15:33:03 +01:00
Sander van der Burg
a18da9b689 titaniumenv: add hack to reduce keychain blocking problems 2018-01-09 13:24:30 +01:00
Sander van der Burg
792d48bc94 titaniumenv: fix path to IPA build product 2018-01-09 12:30:58 +01:00
Sander van der Burg
b481181897 titaniumenv: bump default versions of the SDK and Xcode 2018-01-05 13:50:05 +01:00
Sander van der Burg
fb346c3402 titaniumenv: upgrade to 6.3 and remove deprecated old versions 2018-01-05 12:34:03 +01:00
Sander van der Burg
61a7f0bbf0 xcodeenv: use 9.2 by default 2018-01-05 11:47:30 +01:00
Sander van der Burg
62f7fc8c19 xcodebuild: fix to make it build against the 11.2 iphone SDK 2018-01-05 11:40:34 +01:00
Piotr Bogdan
de0517642d flashtool: mark as broken 
The sources are no longer obtainable from the URL specified in the
expression and the package has no maintainers.
 2017-12-23 22:54:31 +00:00
Benjamin Hipple
4e022bab76 android-platform-tools: 26.0.0 -> 26.0.2 2017-12-03 16:58:03 -05:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Michael Weiss
af78d76718 androidenv: Add the Android Instant Apps SDK 2017-09-09 16:47:19 +02:00
Michael Weiss
498e3a9989 androidenv: Update all packages using fetch.sh 2017-09-09 15:52:07 +02:00
Volth
37e73450d6 androidndk: wrap scripts in $out/libexec 2017-08-17 15:46:01 +00:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS" 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
 2017-08-07 21:41:30 +02:00
taku0
53301fcd63 android-sdk: 25.2.3 -> 25.2.5 2017-08-05 22:22:18 +09:00
Michael Weiss
8f141b2a07 androidenv: Update all packages using fetch.sh 2017-08-04 00:07:39 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Jörg Thalheim
fa68544156 adbfs-rootless: limit platform to linux 2017-06-29 08:20:54 +01:00
Profpatsch
da012dda01 adbfs-rootless: init at 2016-10-02 2017-06-29 08:44:43 +02:00
Michael Weiss
d17bcfc5f0 androidenv: Manually update missing packages 
Improvement: Use nix-shell for fetch.sh

androidsdk{,_extras}:
- Update to 7.1.1

google_apis_25 is missing after fetch.sh due to an error in addon.xml
(upsteam bug).

Addons:
- Add google_apis_25
- Update google_play_services (v8_rc41 -> v11_rc16)
 2017-06-10 03:57:30 +02:00
Michael Weiss
fb26e5c8b6 androidenv: Update all packages using fetch.sh 
Platforms:
- Update platform_25 (r02 -> r03)
- Add platform_26

Sources:
- Add source_25
 2017-06-10 02:29:59 +02:00
Michael Raskin
adadf7e5ce androidsdk: meta.url to meta.homepage 2017-04-29 12:26:16 +02:00
John Ericson
4c0d7da183 Get rid of all with { inherit... } and just used let inherit... 
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
 2017-03-30 03:05:05 -04:00
Sander van der Burg
b81001188c xcodeenv, titaniumenv: fix IPA builds by granting codesign the right permissions 2017-01-27 10:50:36 +01:00
Sander van der Burg
0f6eab52e1 xcodeenv: make it work with Xcode 8.2.1 2017-01-25 16:56:55 +01:00
Sander van der Burg
de9a4f5fb4 titaniumenv: add 6.0 SDK + bump kitchensink testcase 2017-01-24 13:22:16 +01:00
Sander van der Burg
4f7fe27065 titaniumenv: use Node.js 4.x for the CLI tools 2017-01-24 10:55:29 +01:00
taku0
cbcdfdb576 android-sdk: 25.2.2 -> 25.2.3 2016-12-10 19:51:55 +09:00
Alex Ivanov
af1dacc2c3 genymotion: 2.7.2 -> 2.8.0 2016-11-27 13:18:24 +03:00
Alex Ivanov
244f0456f0 genymotion: add menu item 2016-11-27 12:21:25 +03:00
taku0
a229fd4ce3 androidenv: Add API sources 2016-10-09 19:11:55 +09:00
Herwig Hochleitner
685786b7d7 androidenv: update packages 
build-tools      25.1.7 -> 25.2.2
sdk-tools        23.0.1 -> 24.0.2
platform-tools   24 -> 24.0.2
 2016-09-14 18:31:22 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Sergiu Ivanov
9d3172f140 adb-sync: Make platforms correspond to those of androidsdk (main dependency). 2016-09-06 23:55:36 +02:00
Sergiu Ivanov
33cf2d9416 adb-sync: init at 2016-08-31 2016-09-02 16:44:41 +02:00
Sander van der Burg
b17cd148ba androidsdk: fix buildApp and emulateApp functions by providing the right executable paths + fix android emulator by adding dbus to the library path 2016-09-01 13:56:35 +00:00