Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf2e3515a802
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 657b7d06c142
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 1, 2019

  1. top-level/release-cross.nix: add android32

    @matthewbauer
    matthewbauer committed Oct 1, 2019
    Copy the full SHA
    67b5f75 View commit details

  2. Merge pull request #70196 from matthewbauer/add-android32-cross-trunk 

    top-level/release-cross.nix: add android32
    @matthewbauer
    matthewbauer authored Oct 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    657b7d0 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/top-level/release-cross.nix
5 changes: 2 additions & 3 deletions pkgs/top-level/release-cross.nix
View file
Original file line number Diff line number Diff line change
@@ -143,9 +143,8 @@ in

x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon;

/* Linux on Aarch64 */
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
});
android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt linuxCommon;
android32 = mapTestOnCross lib.systems.examples.armv7a-android-prebuilt linuxCommon;

wasi32 = mapTestOnCross lib.systems.examples.wasi32 wasiCommon;