Merge remote-tracking branch 'upstream/master' into staging

Conflicts: pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
parent 39696b6d56 50bbc56b0b
commit 003473613a
81 changed files with 1420 additions and 223 deletions
@@ -45,7 +45,7 @@ rec {

  aarch64-android-prebuilt = rec {
    config = "aarch64-unknown-linux-android";
-    sdkVer = "21";
+    sdkVer = "24";
    platform = platforms.aarch64-multiplatform;
    useAndroidPrebuilt = true;
  };