Commit Graph

656 Commits

Author SHA1 Message Date
SubhrajyotiSen
b3ca5eff48 maestro: 1.26.1 -> 1.27.0 2023-05-02 18:04:39 +05:30
Dmitry Kalinkin
2c7d57db4c
Merge pull request #204278 from status-im/xcode-allow-higher
xcodeenv: allow versions higher than specified
2023-04-27 14:44:08 -04:00
Hadi
077588ad1a
androidenv: put a much nicer error message that includes the available options 2023-04-22 14:47:45 -04:00
Hadi
81f75f9569 androidenv: fix libgcc_s.so.1 -> not found 2023-04-18 20:18:13 +03:00
SubhrajyotiSen
d421a8dadc maestro: 1.26.0 -> 1.26.1 2023-04-14 17:06:31 +05:30
SubhrajyotiSen
7886832204 maestro: 1.25.0 -> 1.26.0 2023-04-13 15:29:44 +05:30
K900
61fd82abeb adb: fix libgcc_s reference 2023-04-10 08:45:51 +03:00
Jakub Sokołowski
ae08ff7b71
xcodeenv: allow versions higher than specified
Add `allowHigher` option to let higher versions of Xcode.
This is useful when xcodeenv is used for `nix-shell` for developers
and their xcode version might be a bit newer than required one.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2023-04-06 19:20:56 +02:00
Sandro
7ecf5641d3
Merge pull request #216142 from status-im/androidenv/fix-toolchains 2023-04-01 23:51:19 +02:00
Weijia Wang
389975d8f5
Merge pull request #198393 from r-ryantm/auto-update/genymotion
genymotion: 3.2.1 -> 3.3.3
2023-03-17 15:39:00 +02:00
SubhrajyotiSen
a05996349c maestro: 1.24.0 -> 1.25.0 2023-03-16 10:25:53 +05:30
R. Ryantm
4a0a84ece7 genymotion: 3.2.1 -> 3.3.3 2023-03-11 09:03:00 +00:00
SubhrajyotiSen
de1f8d6bd8 maestro: 1.23.0 -> 1.24.0 2023-03-07 22:55:02 +05:30
Hadi
a05928d7fe androidenv: make nix-build -A androidenv.test-suite work
androidenv: set config.allowUnfree = true for integration tests

androidenv: fix concerns in the PR
2023-02-28 08:53:43 -05:00
Hadi
d511bfd0e2 androidenv: add shell-with-emulator.nix to have test and more examples
androidenv: replace buildInputs with nativeBuildInputs
2023-02-28 08:53:43 -05:00
Hadi
e5fbfd894f androidenv: fix problem with avdmanager when trying to create an avd
To do so, we gathered different system images with the same
abiVersion in the same derivation.
2023-02-28 08:53:43 -05:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
SubhrajyotiSen
6dc7c7a776 maestro: 1.22.1 -> 1.23.0 2023-02-16 12:58:02 +05:30
Felix Buehler
bc3d5934d7 treewide: use lib.optionals 2023-02-14 19:11:59 +01:00
Jakub Sokołowski
93e9aac7dc
androidenv: fix autopatching toolchains
Use of binaries from NDK `toolchains` has been broken by following PR:

* https://github.com/NixOS/nixpkgs/pull/195752

I'm splitting the patchInstructions to run the ELF patching only on Linux.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2023-02-14 16:12:13 +01:00
Felix Buehler
cdb39a86e0 treewide: use optionalString 2023-02-13 21:52:34 +01:00
SubhrajyotiSen
554438542d maestro: 1.21.3 -> 1.22.1 2023-02-09 21:34:56 +05:30
Jakub Sokołowski
af7c4c68bf
androidenv: fix patching linux prebuilt binaries
This has been broken by following PR due to typo:
https://github.com/NixOS/nixpkgs/pull/195752

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2023-02-09 12:04:46 +01:00
SubhrajyotiSen
c9620640e8 maestro: 1.21.2 -> 1.21.3 2023-01-30 19:03:03 +05:30
Artturi
bf9433fd4c
Merge pull request #210372 from hadilq/androidenv/generate-package.xml-files
androidenv: generate package.xml in packages' directory
2023-01-29 18:12:52 +02:00
Hadi
9c4e43ab70 androidenv: Implement cmdline-tools and patcher
- Replace cmdline-tools with tools because tools is obsolete now.
- Depend emulator package to systemImages

androidenv: fix issues on the PR

androidenv: reformat

androidenv: support excluding of `tools` package

androidenv: provide `tools`, and `build-tools`, dependencies

androidenv: replace includeTools with toolsVersion

androidenv: fix a typo

androidenv: add tests to check licenses and installed packages

androidenv: check if tests are running! this commit should fail!

androidenv: fix problems in the review https://github.com/NixOS/nixpkgs/pull/208793

androidenv: add test-suite to handle more tests around

androidenv: fix the test after couldn't running them with ofborg

Update pkgs/development/mobile/androidenv/build-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: Resolving https://github.com/NixOS/nixpkgs/pull/208793#discussion_r1065851539

Update pkgs/development/mobile/androidenv/cmdline-tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/development/mobile/androidenv/tools.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

androidenv: fix a typo
2023-01-27 18:15:47 -05:00
SubhrajyotiSen
6729809b35 maestro: 1.21.0 -> 1.21.2 2023-01-27 13:18:43 +05:30
SubhrajyotiSen
e4f45e39a7 maestro: 1.20.0 -> 1.21.0 2023-01-25 22:10:54 +05:30
SubhrajyotiSen
c52e921894 maestro: 1.19.5 -> 1.20.0 2023-01-25 09:43:42 +05:30
SubhrajyotiSen
69f59098f9 maestro: 1.19.0 -> 1.19.5 2023-01-19 09:48:00 +05:30
SubhrajyotiSen
ddd8303c56 maestro: 1.18.5 -> 1.19.0 2023-01-13 23:58:50 +05:30
SubhrajyotiSen
33d1f3a4e6 maestro: 1.18.3 -> 1.18.5 2023-01-13 18:23:45 +08:00
Hadi
181e0e91ba androidenv: generate package.xml in packages' directory 2023-01-12 10:19:11 -05:00
Artturi
a6c9e51059
Merge pull request #208380 from hadilq/androidenv/support-deplying-multiple-packages-in-one-derivation
androidenv: Support deploying multiple packages in one derivation
2023-01-11 05:57:24 +02:00
Subhrajyoti Sen
92e9905a79
maestro: 1.18.2 -> 1.18.3
* maestro: 1.18.2 -> 1.18.3
* maestro: add changelog
2023-01-04 23:00:17 +08:00
Hadi
8ca4470a5e androidenv: use unzip in nativeBuildInputs 2023-01-03 18:17:11 -05:00
Hadi
2f06edee4f
Update pkgs/development/mobile/androidenv/deploy-androidpackages.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-01-03 11:05:57 -05:00
Hadi
d1a1f2fa06 androidenv: Fix we are using 2 spaces to intend nix code in
see: https://github.com/NixOS/nixpkgs/pull/208137#discussion_r1059518929
2022-12-31 12:21:21 -05:00
Hadi
bceccb7f70 androidenv: Replace deploy-androidpackage.nix with deploy-androidpackages.nix 2022-12-31 11:21:40 -05:00
Bobby Rong
ada29d3914
Merge pull request #207991 from SubhrajyotiSen/update-maestro
maestro: 1.17.2 -> 1.18.2
2022-12-31 12:25:42 +08:00
Artturi
338097c04c
Merge pull request #208300 from hadilq/androidenv/fix-system-image-download-url-for-default-type 2022-12-30 15:48:07 +02:00
Hadi
6fd11aec99 androidenv: Fix system image download url for default type 2022-12-30 15:30:27 +02:00
Hadi
2f688374e0
androidenv: fix missing packages in repo json (#208137) 2022-12-30 15:28:12 +02:00
SubhrajyotiSen
f7fba0329f maestro: 1.17.2 -> 1.18.2 2022-12-28 21:17:28 +05:30
jakobkukla
14c7a30161 androidenv: fix missing inherit os 2022-12-20 04:28:20 +01:00
jakobkukla
8851f074f8 androidenv: fix non-existent emulatorVersion 2022-12-20 04:28:20 +01:00
Vanilla
32c1e7d7db
androidenv: fix missing inherit os in build-tools 2022-12-17 13:21:54 +08:00
Wael Nasreddine
79f210e5cd
Merge pull request #201563 from SubhrajyotiSen/patch-2 2022-12-16 11:42:30 -08:00
Artturi
f9b2c36a7f
Merge pull request #205701 from Artturin/deprecatereplacechars
lib.replaceChars: warn about being a deprecated alias
2022-12-15 23:46:51 +02:00
Artturin
05a2dfd674 lib.replaceChars: warn about being a deprecated alias
replaceStrings has been in nix since 2015(nix 1.10)

so it is safe to remove the fallback

d6d5885c15
2022-12-15 22:25:51 +02:00
Artturin
a2f85e0fa8 androidenv: use callPackage instead of import & fix infinite recursion
infinite recursion was due to autoPatchelfHook being in buildInputs of
platform-tools, i will add a lint for it in nix-community/nixpkgs-lint.

```
$ nix build ".#pkgsCross.aarch64-android-prebuilt.hello" --show-trace 2>&1 | rg 'while evaluating the attr.+deriv'
    … while evaluating the attribute 'stdenv' of the derivation 'zlib-aarch64-unknown-linux-android-1.2.13'
    … while evaluating the attribute 'CPPFLAGS' of the derivation 'python3-aarch64-unknown-linux-android-3.10.8'
    … while evaluating the attribute 'setuptools' of the derivation 'python-catch-conflicts-hook'
    … while evaluating the attribute 'nativeBuildInputs' of the derivation 'python3.10-pyelftools-0.28'
    … while evaluating the attribute 'passAsFile' of the derivation 'python3-3.10.8-env'
    … while evaluating the attribute 'pythonInterpreter' of the derivation 'auto-patchelf-hook'
    … while evaluating the attribute 'buildInputs' of the derivation 'platform-tools-33.0.2'
    … while evaluating the attribute 'installPhase' of the derivation 'ndk-24.0.8215888'
    … while evaluating the attribute 'installPhase' of the derivation 'aarch64-unknown-linux-android-ndk-toolchain-24.0.8215888'
    … while evaluating the attribute 'bintools_bin' of the derivation 'aarch64-unknown-linux-android-ndk-toolchain-wrapper-24.0.8215888'
    … while evaluating the attribute 'bintools' of the derivation 'aarch64-unknown-linux-android-ndk-toolchain-wrapper-24.0.8215888'
    … while evaluating the attribute 'defaultNativeBuildInputs' of the derivation 'stdenv-linux'
    … while evaluating the attribute 'stdenv' of the derivation 'hello-aarch64-unknown-linux-android-2.12.1'
```

stdenv -> stdenv.cc -> bintools -> android-ndk-toolchain -> ndk -> platform-tools -> auto-patchelf-hook -> python3 -> zlib -> stdenv -> stdenv.cc -> ...

autoPatchelfHook was in buildInputs of platform-tools so we needed the host tools to build
it but platform-tools was a required tool
2022-12-15 21:55:22 +02:00
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