Commit Graph

655 Commits

Author SHA1 Message Date
SubhrajyotiSen
49ad241e30 maestro: 1.15.0 -> 1.17.2 2022-12-16 00:54:37 +05:30
Léo Gaspard
ad25aa1098
androidenv: use emulator from the path that makes it find qemu (#202088) 2022-12-06 21:16:49 +01:00
Subhrajyoti Sen
41d11e3624 maestro: 1.11.3 -> 1.15.0 2022-11-29 09:31:20 +05:30
Wael Nasreddine
a633c0e2e2
Merge pull request #198844 from SubhrajyotiSen/maestro 2022-11-03 10:07:20 -07:00
SubhrajyotiSen
eb481df8e4 maestro: init at 1.11.3 2022-11-01 03:31:07 +05:30
Sheldon Neuberger
a5f4369130 androidenv: fix darwin ndk symlink
Today the nix ndk package on darwin points to a directory that doesn't
exist. This fix was added previously for linux but is needed on all
platforms.
2022-10-27 10:12:54 -07:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Artturi
79c42aa06c
Merge pull request #186564 from Artturin/crossevalfixes
Fixes for cross-compilation
2022-08-27 17:49:00 +03:00
Artturin
c6568adb00 treewide: makeWrapper buildInputs to nativeBuildInputs
most found with https://github.com/siraben/nix-lint
2022-08-16 13:14:19 +03:00
Charlotte Van Petegem
8cf6dd815f
androidenv: fix build of build-tools >= 33
mainDexClasses seems to have been removed in this version of build-tools. (Seems
to, because the release notes are not updated at all, unfortunately:
https://developer.android.com/studio/releases/build-tools).
2022-08-16 09:37:44 +02:00
Van Tuan Vo
8b8ac80759
androidenv: fix default ndk linking for ndk > 22 2022-07-24 20:35:49 +02:00
Van Tuan Vo
e8dfc2d72a
androidenv: fix ndk linking for ndk < 23 2022-07-24 20:35:48 +02:00
Jari Vetoniemi
2408ef3c6f androidndk: remove legacy ndks
allows us to remove python2 dependencies and lot more
2022-06-29 18:27:16 +09:00
Jari Vetoniemi
0aded46f08 androidenv: update packages 2022-06-29 18:27:16 +09:00
Jari Vetoniemi
5f1923d67e androidenv: fix android cross-compilers
These were completely broken. Even if they managed to output a binary,
it wouldn't actually run on the actual device.
2022-06-29 18:27:16 +09:00
Manuel Bärenz
0856383b26 androidenv: Fix emulator 2022-06-20 14:30:31 +02:00
Sandro
280d485b6f
Merge pull request #178311 from NixOS/gomobile-2022-05-04
android tools: fix meta license
2022-06-20 12:02:00 +02:00
Sandro
a522b56ff5
Merge pull request #172355 from status-im/gomobile-2022-05-04 2022-06-20 11:31:10 +02:00
Sandro Jäckel
2d1147930b
android tools: fix meta license 2022-06-20 11:26:44 +02:00
Maximilian Bosch
cdbc6e64e4
treewide: reduce maintenance workload for ma27
Note: I DO NOT resign from nixpkgs, not at all!

However, I like a clean notification inbox and I get a lot of stuff for
packages where I'm only an end-user or don't use them anymore and thus
can't help out that much.

So please consider it a measure to reduce the mental load for me when
going through my notifications ;-)
2022-06-19 12:07:43 +02:00
Robert Scott
12eea1c636 treewide/development: add sourceType binaryNativeCode for many packages
excluding compilers and interpreters as some new tricks may be
needed to cover their various bootstrapping processes properly
2022-06-16 20:12:04 +01:00
Jakub Sokołowski
53cf6df9d5
gomobile: 2021-06-14 -> 2022-05-18
Includes several important fixes for macOS and Catalyst, Android NDKs,
and iOS builds.

- https://go.googlesource.com/mobile/+/8578da9835fd365e78a6e63048c103b27a53a82c
- https://go.googlesource.com/mobile/+/76c259c465ba39f84de7e2751a666612ddca556b
- https://go.googlesource.com/mobile/+/9cba7bc03c0fdba1b8fe7dfd476c2001656dde9e
- https://go.googlesource.com/mobile/+/80cb72e7af8e71b65e7d9e59fb4ec5d620134608
- https://go.googlesource.com/mobile/+/6d8ad35e460371e979b330d80492cba19676f933
- https://go.googlesource.com/mobile/+/b5eb1abba0f2d9331b29a29967d535890e026cec

Also moves use of `wrapProgram` to `postFixup` and dropped `ANDROID_NDK_HOME`.
No longer necessary as `8578da98` detects it from `ANDROID_HOME`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2022-06-15 09:58:44 +02:00
Sandro
f8431d91f1
Merge pull request #176078 from trofi/workaround-fno-common-for-xpwn
xpwn: add -fcommon workaround
2022-06-03 17:12:07 +02:00
Sergei Trofimovich
c0d4a1bfe4 webos.novacomd: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: src/host/usb-linux.c:82: multiple definition of `t_recovery_queue';
      src/host/recovery.c:45: first defined here
2022-06-03 14:57:18 +01:00
Sergei Trofimovich
7595ca654a xpwn: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: ../ipsw-patch/libxpwn.a(libxpwn.c.o):(.bss+0x4): multiple definition of
      `endianness'; CMakeFiles/xpwn-bin.dir/src/xpwn.cpp.o:(.bss+0x0): first defined here
2022-06-03 10:00:52 +01:00
Sandro
1fdeb86121
Merge pull request #169468 from Atemu/update/android-env
androidenv: regenerate repo.json
2022-05-31 15:38:21 +02:00
Janne Heß
bfc5086ae9
Merge pull request #173671 from Mindavi/treewide/broken-zhf
treewide: start marking packages broken
2022-05-30 14:10:43 +02:00
Rick van Schijndel
03bc571744
treewide: pkgs/development: mark broken for darwin 2022-05-30 13:42:57 +02:00
Jakub Sokołowski
b0663a3dc3
androidenv: include autoPatchelfHook only on Linux
This is supposed to fix an issue caused by this PR:
https://github.com/NixOS/nixpkgs/pull/163924

Which made `autoPatchelfHook` available only on Linux, resulting in
builds of Android packages failing with:
```
error: Package ‘auto-patchelf-hook’ in /nix/store/...-nixpkgs-source/pkgs/build-support/trivial-builders.nix:73
    is not supported on ‘x86_64-darwin’, refusing to evaluate.
```

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2022-05-29 23:17:37 +02:00
Artturin
c1fffdfffb treewide: change some glibc to stdenv.cc.libc 2022-05-27 05:57:43 +03:00
Artturin
0c4d65b21e treewide: stdenv.glibc -> glibc 2022-05-25 15:51:20 +03:00
Atemu
1df306132b platform-tools: allow aarch64-darwin 2022-04-20 20:43:45 +02:00
Atemu
928d976aa5 androidenv: regenerate repo.json 2022-04-20 20:33:12 +02:00
Atemu
e48ca2fa56 androidenv: document update procedure 2022-04-20 20:26:59 +02:00
github-actions[bot]
f0248f968f
Merge staging-next into staging 2022-03-29 06:01:53 +00:00
Malo Bourgon
6f9296d1b6 cocoapods: move to more appropriate directory 2022-03-28 18:36:59 -07:00
github-actions[bot]
36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
Dolphin von Chips
28d80ffa92 genymotion: fix startup on Qt-based environments
Currently trying to run Genymotion on Plasma 5 fails at all, Genymotion
itself complaining about libqtquickcontrols2materialstyleplugin.so using
"incompatible Qt library".
As it turns out, this package ships its own
version of Qt but does not ignore any environment variables related to
Qt, which results in Genymotion's Qt using (apparently incompatible)
QML plugins from user's system. This can be fixed quite easily by
unsetting `QML2_IMPORT_PATH` in a wrapper, which this patch does.
There might be more such problems, but I haven't encountered them yet,
so fixing those will be up to someone else ;)
2022-03-24 16:32:38 +05:00
OPNA2608
d2f268745a treewide: autoPatchelfHook only on Linux 2022-03-23 21:37:39 +01:00
Nick Cao
29d7307a05
abootimg: fix cross compilation and set strictDeps 2022-01-09 09:18:21 +08:00
Bobby Rong
5a359ba13c
Merge pull request #150122 from miallo/patch-1
androidenv: change default emulatorVersion to one available
2022-01-01 22:48:16 +08:00
Yana Timoshenko
719567e91f maintainers: update personal details 2021-12-31 21:48:55 +03:00
Michael Lohmann
962d74ce84
androidenv: default emulatorVersion to one available
The last repo.json update in a0f6a8af81 removed the default emulator version, so it had to be changed (or the repo.json had to be overwritten) for it to work.
Instead use the most recent available emulator version
2021-12-10 20:43:45 +01:00
github-actions[bot]
2d03d542c7
Merge master into staging-next 2021-11-20 12:01:21 +00:00
Ryan Burns
15111f8a9a ndk-bundle: fix build
Since b79483d2b7,
the various architectures of the prebuilt libraries cause
errors, so we need to tell patchelf to ignore missing deps.
2021-11-19 23:37:11 -08:00
github-actions[bot]
c83cfc58e5
Merge master into staging-next 2021-11-19 00:01:26 +00:00
Sandro
a8ff9bca03
Merge pull request #146504 from flexagoon/emulator-fix 2021-11-18 19:44:20 +01:00
flexagoon
2ec2ad064b androidenv: fix emulator build on Linux 2021-11-18 20:02:45 +03:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
Felix Buehler
596f47648e imgpatchtools: switch to fetchFromGitHub 2021-11-12 00:12:23 +01:00
Felix Buehler
66e4f4b3ee pkgs/development: followup fmt 2021-11-10 14:03:48 +01:00
Felix Buehler
345d71ffd0 pkgs/development: rename name to pname&version 2021-11-10 14:03:21 +01:00
Sandro
3e09ae93b1
Merge pull request #144748 from status-im/gomobile-aarch64-darwin-fix 2021-11-09 22:45:19 +01:00
R. RyanTM
7635b869ce genymotion: 2.8.0 -> 3.2.1 2021-11-08 14:09:01 +02:00
Alyssa Ross
02dfbde639
treewide: use mirror URLs where available
Candidates identified with

	git grep -F "$(grep -v '#' pkgs/build-support/fetchurl/mirrors.nix |
		grep -v nixos.org | grep :// | cut -d '"' -f 2)"

and then manually reviewed and tested.
2021-11-06 01:56:39 +00:00
Jakub Sokołowski
22c0c35724
gomobile: make providing Android SDK optional
Currently there are no `aarch64-darwin` builds of Android SDK available.
For this reason attempts to build `gomobile` on that platform fail with:
```
No Android SDK tarballs are available for system architecture: aarch64-darwin
```

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-11-05 18:20:30 +01:00
Sandro Jäckel
8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
Winter
65135081f6 cocoapods: 1.10.2 -> 1.11.0 2021-09-10 20:11:34 -04:00
Winter
f6def75c96 cocoapods: make update script set gemfile platform to ruby 2021-09-10 20:11:34 -04:00
Alyssa Ross
c9ce275aa4
treewide: "does not exists" -> "does not exist"
I noticed this minor grammar mistake when running update.nix, and then
while grepping to find the source I noticed we had it a few times in
Nixpkgs.  Just as easy to fix treewide as it was to fix the one
occurrence I noticed.
2021-09-09 18:45:33 +00:00
Charlotte Van Petegem
a0f6a8af81
androidenv: regenerate repo.json 2021-08-21 12:20:50 +02:00
Winter
174705b56c cocoapods: 1.10.1 -> 1.10.2 2021-08-17 00:59:11 -04:00
Jakub Sokołowski
3343c0e4c3
gomobile: 2020-06-22 -> 2021-06-14
This upgrade together with Go 1.16 drops support for iOS ARM32 builds.

The need for applying a patch was also removed by this fix:
https://go.googlesource.com/mobile/+/7c8f154d100840bc5828285bb390bbae1cb5a98c

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-07-22 11:10:57 +02:00
github-actions[bot]
382fdc7ad3
Merge master into staging-next 2021-07-18 00:01:24 +00:00
Felix Buehler
1e9baed56b various: cleanup of 'inherit version;' 2021-07-16 00:17:12 +02:00
github-actions[bot]
a28ba52cac
Merge staging-next into staging 2021-07-05 18:01:46 +00:00
Jonas Heinrich
6a53ffac3e
checkra1n: init at 0.12.4 (#128798) 2021-07-05 18:39:59 +02:00
Felix Buehler
936168eee5 flashtool: remove
Because the download is down for copyright reasons and the site looks very fishy and very similar to the ones used to distribute content illegally.
2021-06-30 09:53:51 +02:00
Pavol Rusnak
68889ed61f
treewide: use quotes for url 2021-06-20 16:26:23 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Jonas Chevalier
c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02:00
John Ericson
14b427a7e4
Merge pull request #119092 from numinit/update-androidenv
androidenv: Allow multiple ndkVersions to be specified
2021-04-25 10:08:05 -04:00
Morgan Jones
a7e5b070be androidenv: Allow multiple ndkVersions to be specified
Android is deprecating ndk.dir in favor of specifying exact NDK
version in Gradle configuration. Ensure that we can support multiple
NDKs, and link them into the location the Android Gradle Plugin expects.
2021-04-24 15:56:08 -06:00
Jakub Sokołowski
dd2a8245a1
gomobile: init at 2020-06-22
The Android SDK is provided by `nixpkgs`, and in case of the Status Project
we build our app using that SDK in combination with gomobile since our
protocol library is written in Go:
https://github.com/golang/mobile

This tool is quite powerful and allows you even to build entire applications in Go:
https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile#hdr-Compile_android_APK_and_iOS_app

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-04-23 11:17:17 +02:00
Sandro
151d746ab5
Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain 2021-03-30 16:59:38 +02:00
Rolf Schröder
c03f846b46 android: replace '$(pwd)' by '.' 2021-03-27 12:46:58 +01:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Samuel Gräfenstein
6b6d2abfa0
treewide: xlibs -> xorg
Fix building with `config.allowAliases = false;`.
2021-03-17 00:00:18 +01:00
github-actions[bot]
121cc02fe8
Merge master into staging-next 2021-03-12 06:17:54 +00:00
Steven Pease
b2942f0e2a cocoapods-beta: 1.10.0 -> 1.10.1 2021-03-11 13:10:59 -08:00
Steven Pease
108aa14927 cocoapods: 1.10.0 -> 1.10.1 2021-03-11 13:10:04 -08:00
Rolf Schröder
2985284ccb android: Fix shebangs in auto-generated android toolchain scripts
The script make_standalone_toolchain.py autogenerates some shell scripts
when invoked. These scripts have a hardcoded shebang of '#!/bin/bash'.
The generated scripts obviously do not work in a Nix environment. This
commit makes sure the scripts have the correct shebang.
2021-03-09 21:13:28 +01:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
s1341
aee60bef7a android_prebuilt: Fix eval 2021-03-04 18:17:39 +00:00
Ben Siraphob
127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Ben Siraphob
a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
Ryan Burns
b98bfb6536 androidenv: do not copy verbosely
Verbose copying can exceed hydra's output limit,
causing spurious failures. For example, see:
https://hydra.nixos.org/eval/1644892?filter=android
2021-01-27 02:03:14 -08:00
Pavol Rusnak
a6f6f739c8
Merge pull request #109655 from prusnak/stdenv-lib-mobile
pkgs/development/mobile: stdenv.lib -> lib
2021-01-23 12:11:03 +01:00
zowoq
59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
Pavol Rusnak
c3bbfb77ad
pkgs/development/mobile: stdenv.lib -> lib 2021-01-21 20:45:23 +01:00
zowoq
932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
numinit
5b91d4ab65 Rework androidenv package generation
androidenv did not previously write license files, which caused certain
gradle-based Android tools to fail. Restructure androidenv's list of
Android packages into a single repo.json file to prevent duplication
and enable us to extract the EULA texts, which we then hash with
builtins.hashString to produce the license files that Android gradle
tools look for.

Remove includeDocs and lldbVersions, as these have been removed
from the Android package repositories.

Improve documentation and examples.
2021-01-03 21:27:23 -07:00
Jan Tojnar
3afc4e8a81
androidsdk_9_0: fix evaluation without aliases 2020-12-06 11:07:40 +01:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Lily Ballard
a5ec423734 cocoapods-beta: 1.10.0.beta.2 -> 1.10.0 2020-11-07 20:30:27 -05:00
Lily Ballard
16ee3d1e09 cocoapods: 1.9.3 -> 1.10.0 2020-11-07 20:30:27 -05:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
John Ericson
452854a13c androidndk: Avoid depending on target-sensative openjdk
We just need jdk for this script that helps set up toolchains. The
script might need to know about the target platform, but the interpreter
that runs it (or part of it) doesn't.
2020-09-08 09:49:39 -04:00
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