diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 145185bdf26e..3bac305a4770 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -36,6 +36,8 @@ - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". +- The default Android NDK version has been raised to 27, and the default SDK version to 35. + - `conftest` since `0.60.0` has moved to use rego `v1` as default. To continue using `v0` use `--rego-version v0`. For more information about upgrading to Rego v1 syntax, see the [upstream docs](https://www.openpolicyagent.org/docs/latest/v0-upgrade/). - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index a3ac648dee18..9686ee8e59ab 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -72,8 +72,8 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; rust.rustcTarget = "armv7-linux-androideabi"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; useAndroidPrebuilt = true; } // platforms.armv7a-android; @@ -81,15 +81,15 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; rust.rustcTarget = "aarch64-linux-android"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; useAndroidPrebuilt = true; }; aarch64-android = { config = "aarch64-unknown-linux-android"; - androidSdkVersion = "33"; - androidNdkVersion = "26"; + androidSdkVersion = "35"; + androidNdkVersion = "27"; libc = "bionic"; useAndroidPrebuilt = false; useLLVM = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10eb1c12d1ae..e60d3bbf6b5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1775,7 +1775,7 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; - androidndkPkgs = androidndkPkgs_26; + androidndkPkgs = androidndkPkgs_27; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs { })."21"; androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs { })."23"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs { })."24";