androidenv: manually (!) delete default images with same name

... complex as apparently dependent on OS of host of emulator.

This shall rather be solved by enhancement of the scripts.

2 files changed, 1 insertions, 133 deletions

diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix
index 74efe60be92b..043529cb2380 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix
+++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix
@@ -281,28 +281,6 @@
       sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780";
     };
   };
-  "29".default."x86" = {
-    name = "system-image-29-default-x86";
-    path = "system-images/android-29/default/x86";
-    revision = "29-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-29_r07-windows.zip;
-      sha1 = "e0e6504734f601c28350528d39a4b17b3e0f82dc";
-    };
-  };
-  "29".default."x86" = {
-    name = "system-image-29-default-x86";
-    path = "system-images/android-29/default/x86";
-    revision = "29-default-x86";
-    displayName = "Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-29_r07-darwin.zip;
-      sha1 = "e0e6504734f601c28350528d39a4b17b3e0f82dc";
-      url = https://dl.google.com/android/repository/sys-img/android/x86-29_r07-linux.zip;
-      sha1 = "e0e6504734f601c28350528d39a4b17b3e0f82dc";
-    };
-  };
   "21".default."x86_64" = {
     name = "system-image-21-default-x86_64";
     path = "system-images/android-21/default/x86_64";
@@ -383,26 +361,4 @@
       sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0";
     };
   };
-  "29".default."x86_64" = {
-    name = "system-image-29-default-x86_64";
-    path = "system-images/android-29/default/x86_64";
-    revision = "29-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-29_r07-windows.zip;
-      sha1 = "c8e307b885a68f71b4889a70bffea729fc4ecbfa";
-    };
-  };
-  "29".default."x86_64" = {
-    name = "system-image-29-default-x86_64";
-    path = "system-images/android-29/default/x86_64";
-    revision = "29-default-x86_64";
-    displayName = "Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-29_r07-darwin.zip;
-      sha1 = "c8e307b885a68f71b4889a70bffea729fc4ecbfa";
-      url = https://dl.google.com/android/repository/sys-img/android/x86_64-29_r07-linux.zip;
-      sha1 = "c8e307b885a68f71b4889a70bffea729fc4ecbfa";
-    };
-  };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
index c64b1eeeff87..20377efe0d4c 100644
--- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
+++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix
@@ -61,92 +61,4 @@
       sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c";
     };
   };
-  "29".google_apis_playstore."x86" = {
-    name = "system-image-29-google_apis_playstore-x86";
-    path = "system-images/android-29/google_apis_playstore/x86";
-    revision = "29-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-windows.zip;
-      sha1 = "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970";
-    };
-  };
-  "29".google_apis_playstore."x86" = {
-    name = "system-image-29-google_apis_playstore-x86";
-    path = "system-images/android-29/google_apis_playstore/x86";
-    revision = "29-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-darwin.zip;
-      sha1 = "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970";
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip;
-      sha1 = "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970";
-    };
-  };
-  "29".google_apis_playstore."x86_64" = {
-    name = "system-image-29-google_apis_playstore-x86_64";
-    path = "system-images/android-29/google_apis_playstore/x86_64";
-    revision = "29-google_apis_playstore-x86_64";
-    displayName = "Google Play Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-windows.zip;
-      sha1 = "94835980b4a6eaeeb41936d7fb1381698e48433a";
-    };
-  };
-  "29".google_apis_playstore."x86_64" = {
-    name = "system-image-29-google_apis_playstore-x86_64";
-    path = "system-images/android-29/google_apis_playstore/x86_64";
-    revision = "29-google_apis_playstore-x86_64";
-    displayName = "Google Play Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-darwin.zip;
-      sha1 = "94835980b4a6eaeeb41936d7fb1381698e48433a";
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip;
-      sha1 = "94835980b4a6eaeeb41936d7fb1381698e48433a";
-    };
-  };
-  "R".google_apis_playstore."x86" = {
-    name = "system-image-R-google_apis_playstore-x86";
-    path = "system-images/android-R/google_apis_playstore/x86";
-    revision = "R-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-R_r01-windows.zip;
-      sha1 = "1bcb7d2ba381028fc1fc24905f3009a3a5a826f2";
-    };
-  };
-  "R".google_apis_playstore."x86" = {
-    name = "system-image-R-google_apis_playstore-x86";
-    path = "system-images/android-R/google_apis_playstore/x86";
-    revision = "R-google_apis_playstore-x86";
-    displayName = "Google Play Intel x86 Atom System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-R_r01-darwin.zip;
-      sha1 = "1bcb7d2ba381028fc1fc24905f3009a3a5a826f2";
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-R_r01-linux.zip;
-      sha1 = "1bcb7d2ba381028fc1fc24905f3009a3a5a826f2";
-    };
-  };
-  "R".google_apis_playstore."x86_64" = {
-    name = "system-image-R-google_apis_playstore-x86_64";
-    path = "system-images/android-R/google_apis_playstore/x86_64";
-    revision = "R-google_apis_playstore-x86_64";
-    displayName = "Google Play Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-R_r01-windows.zip;
-      sha1 = "aef2a953f20ca40ab94a4e1d633d2c84a27dc1e1";
-    };
-  };
-  "R".google_apis_playstore."x86_64" = {
-    name = "system-image-R-google_apis_playstore-x86_64";
-    path = "system-images/android-R/google_apis_playstore/x86_64";
-    revision = "R-google_apis_playstore-x86_64";
-    displayName = "Google Play Intel x86 Atom_64 System Image";
-    archives.all = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-R_r01-darwin.zip;
-      sha1 = "aef2a953f20ca40ab94a4e1d633d2c84a27dc1e1";
-      url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-R_r01-linux.zip;
-      sha1 = "aef2a953f20ca40ab94a4e1d633d2c84a27dc1e1";
-    };
-  };
 }