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
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
