diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-08 17:57:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:31:47 +0000 |
commit | ee7984efa14902a2ddd820c937457667a4f40c6a (patch) | |
tree | c9c1d046733cefe5e21fdd8a52104175d47b2443 /nixpkgs/pkgs/development/mobile | |
parent | ffc9d4ba381da62fd08b361bacd1e71e2a3d934d (diff) | |
parent | b3c692172e5b5241b028a98e1977f9fb12eeaf42 (diff) | |
download | nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.gz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.bz2 nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.lz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.xz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.zst nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.zip |
Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile')
8 files changed, 445 insertions, 274 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index f528fcd8558f..316c1ba8313e 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -3,8 +3,8 @@ }: { toolsVersion ? "26.1.1" -, platformToolsVersion ? "31.0.2" -, buildToolsVersions ? [ "30.0.3" ] +, platformToolsVersion ? "31.0.3" +, buildToolsVersions ? [ "31.0.0" ] , includeEmulator ? false , emulatorVersion ? "30.6.3" , platformVersions ? [] diff --git a/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/nixpkgs/pkgs/development/mobile/androidenv/repo.json index e8e0bf080fef..d8d55e641bbf 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -1400,6 +1400,27 @@ }, "29": { "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", + "size": 1242979582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip" + }, + { + "os": "linux", + "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", + "size": 1242979582, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-29-google_apis_playstore-arm64-v8a", + "path": "system-images/android-29/google_apis_playstore/arm64-v8a", + "revision": "29-google_apis_playstore-arm64-v8a" + }, "x86": { "archives": [ { @@ -1462,15 +1483,15 @@ "archives": [ { "os": "macosx", - "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", - "size": 1207055010, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-darwin.zip" + "sha1": "7208c0b72b51adb561595e62891763d7322964a0", + "size": 1308440072, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-darwin.zip" }, { "os": "linux", - "sha1": "38dc28908c1784a15fbaf64dd8f8d58279d9ce75", - "size": 1207055010, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r09-linux.zip" + "sha1": "7208c0b72b51adb561595e62891763d7322964a0", + "size": 1308440072, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", @@ -1535,55 +1556,55 @@ } } }, - "S": { + "31": { "google_apis_playstore": { "arm64-v8a": { "archives": [ { "os": "macosx", - "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733", - "size": 1333046412, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-darwin.zip" + "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", + "size": 1394878415, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-darwin.zip" }, { "os": "linux", - "sha1": "528e302e9966e8320d1c2bdc8235762fe4a9e733", - "size": 1333046412, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-S_r03-linux.zip" + "sha1": "bef2699f7fd74fe0c4106a8898833074de72984d", + "size": 1394878415, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r06-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", - "name": "system-image-S-google_apis_playstore-arm64-v8a", - "path": "system-images/android-S/google_apis_playstore/arm64-v8a", - "revision": "S-google_apis_playstore-arm64-v8a" + "name": "system-image-31-google_apis_playstore-arm64-v8a", + "path": "system-images/android-31/google_apis_playstore/arm64-v8a", + "revision": "31-google_apis_playstore-arm64-v8a" }, "x86_64": { "archives": [ { "os": "windows", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-windows.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-windows.zip" }, { "os": "macosx", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-darwin.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-darwin.zip" }, { "os": "linux", - "sha1": "093e0537cb18b25d8399a1af3ec955d2085f15ff", - "size": 1384401947, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-S_r03-linux.zip" + "sha1": "6450e33574aba4746682cfa72edd4e89947fed38", + "size": 1433583169, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r06-linux.zip" } ], "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", - "name": "system-image-S-google_apis_playstore-x86_64", - "path": "system-images/android-S/google_apis_playstore/x86_64", - "revision": "S-google_apis_playstore-x86_64" + "name": "system-image-31-google_apis_playstore-x86_64", + "path": "system-images/android-31/google_apis_playstore/x86_64", + "revision": "31-google_apis_playstore-x86_64" } } } @@ -3101,32 +3122,32 @@ "path": "build-tools/30.0.3", "revision": "30.0.3" }, - "31.0.0-rc3": { + "31.0.0": { "archives": [ { - "os": "macosx", - "sha1": "e75dfb7a975809ba0ca0d25c2b82f7fd56444a4b", - "size": 53224980, - "url": "https://dl.google.com/android/repository/012061446cfd98341585d0d07401d0bd1a4c30f6.build-tools_r31-rc3-macosx.zip" - }, - { "os": "windows", - "sha1": "9d9ce209353c9046abe16285d58ef893c4b42221", - "size": 57592553, - "url": "https://dl.google.com/android/repository/41966dc138d44a3e3797b92fb68bf70552011d5d.build-tools_r31-rc3-windows.zip" + "sha1": "032da328482814e6ef7fe918665c07e8f8f806ca", + "size": 56688233, + "url": "https://dl.google.com/android/repository/09489e417c0a266f2862ddd82b4ac29a1b7af55e.build-tools_r31-windows.zip" }, { "os": "linux", - "sha1": "6859f11348d3984afbfcc74984802bd2e31cc0e2", - "size": 54724181, - "url": "https://dl.google.com/android/repository/build-tools_r31-rc3-linux.zip" + "sha1": "9dbebfdb9ff4c0dbc4ef00677986bf571ddcf99c", + "size": 54931191, + "url": "https://dl.google.com/android/repository/build-tools_r31-linux.zip" + }, + { + "os": "macosx", + "sha1": "c9b4215affd183974b1b2d1c5745911203f56de5", + "size": 52867497, + "url": "https://dl.google.com/android/repository/d32e21a8aa8492ef8b86a489f601da425842b5da.build-tools_r31-macosx.zip" } ], - "displayName": "Android SDK Build-Tools 31-rc3", - "license": "android-sdk-preview-license", + "displayName": "Android SDK Build-Tools 31", + "license": "android-sdk-license", "name": "build-tools", - "path": "build-tools/31.0.0-rc3", - "revision": "31.0.0-rc3" + "path": "build-tools/31.0.0", + "revision": "31.0.0" } }, "cmake": { @@ -3321,115 +3342,115 @@ "path": "cmdline-tools/3.0", "revision": "3.0" }, - "4.0-rc01": { + "4.0": { "archives": [ { "os": "linux", - "sha1": "98d3f2715f6bfbacef063d1376d7765fe5b93309", - "size": 99514756, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-6987402_latest.zip" + "sha1": "87e7cd8879ed469117f20090dc4d454a24e30170", + "size": 103957858, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" }, { "os": "macosx", - "sha1": "573d312a3fdc7700d9c395d647292d90b193d4ee", - "size": 99514744, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-6987402_latest.zip" + "sha1": "8fcf59d208cb5d48e1233979aa5187e7dfb98cf3", + "size": 103957846, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" }, { "os": "windows", - "sha1": "72fae22d41fb8aa4f22e408e18c9d00f06050f7b", - "size": 99496635, - "url": "https://dl.google.com/android/repository/commandlinetools-win-6987402_latest.zip" + "sha1": "ede5b054c06a7fea51bfd27041a100bae5521803", + "size": 103939737, + "url": "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip" } ], "displayName": "Android SDK Command-line Tools", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "cmdline-tools", - "path": "cmdline-tools/4.0-beta01", - "revision": "4.0-rc01" + "path": "cmdline-tools/4.0", + "revision": "4.0" }, - "5.0-rc01": { + "5.0": { "archives": [ { "os": "linux", - "sha1": "f06b1642396ef1e431b990dbe386d5f1e3deabcc", - "size": 102189958, - "url": "https://dl.google.com/android/repository/commandlinetools-linux-7006259_latest.zip" + "sha1": "0885385de11983c020ff0d47039987fe372160d2", + "size": 109673042, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" }, { "os": "macosx", - "sha1": "0752424530724f76cb5a28de84d663e63739e6ee", - "size": 102189946, - "url": "https://dl.google.com/android/repository/commandlinetools-mac-7006259_latest.zip" + "sha1": "49538fa064c077b188bdb51f3aa57bb2882b0abd", + "size": 109673028, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip" }, { "os": "windows", - "sha1": "6f8e359dba91af39c046a791ea32e3ca5149a078", - "size": 102171837, - "url": "https://dl.google.com/android/repository/commandlinetools-win-7006259_latest.zip" + "sha1": "a2f359fb8b075acebcb3e3e48b4170cfe4071882", + "size": 109651902, + "url": "https://dl.google.com/android/repository/commandlinetools-win-7583922_latest.zip" } ], "displayName": "Android SDK Command-line Tools", - "license": "android-sdk-preview-license", + "license": "android-sdk-license", "name": "cmdline-tools", - "path": "cmdline-tools/5.0-alpha01", - "revision": "5.0-rc01" + "path": "cmdline-tools/5.0", + "revision": "5.0" } }, "emulator": { - "30.5.5": { + "30.8.4": { "archives": [ { - "os": "macosx", - "sha1": "90f8a9942253db75ab4d13f791377e9739a88617", - "size": 300476485, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7285888.zip" - }, - { "os": "linux", - "sha1": "ccdee1aa99e4ec39f5a762d6912682ac248b92f0", - "size": 272500365, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7285888.zip" + "sha1": "140f833321684f7696e4b9012636c45eaa5b6a4a", + "size": 277522999, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-7600983.zip" }, { "os": "windows", - "sha1": "84c3105ba1a3a94963e1f99b3f706d0231948fc9", - "size": 324371999, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7285888.zip" + "sha1": "c26170db8aba1bbfcfe63481e95a90bc7b2ff129", + "size": 326723360, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-7600983.zip" + }, + { + "os": "macosx", + "sha1": "9811a649c516153681471f897a02398947640045", + "size": 315292647, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7600983.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "30.5.5" + "revision": "30.8.4" }, - "30.6.3": { + "30.9.0": { "archives": [ { "os": "macosx", - "sha1": "66c9b788de49548d0faab052274f97b042f7241d", - "size": 308984491, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7266284.zip" + "sha1": "b197e04e0543271899a1bd956a3f828e1159086b", + "size": 315330447, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-7634933.zip" }, { "os": "linux", - "sha1": "ecd9b55fe4784b6c8683faa4b1d2c951b8929154", - "size": 272243636, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-7266284.zip" + "sha1": "5cdfb2b27f24ded22348535f2de28ec373e203c8", + "size": 277557089, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-7634933.zip" }, { "os": "windows", - "sha1": "5736749dc46ad950ec84e8275dfde2606d3e8a80", - "size": 324657514, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-7266284.zip" + "sha1": "aed5ba827d0c1d68c8663a4d786f184aaeb939ed", + "size": 326205048, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-7634933.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "30.6.3" + "revision": "30.9.0" } }, "extras": { @@ -3460,32 +3481,32 @@ "path": "extras/google/auto", "revision": "1.1" }, - "2.0-rc1": { + "2.0-rc2": { "archives": [ { "os": "linux", - "sha1": "b480489e604371301da10731a793b234b01b8f42", - "size": 4527281, - "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc1.zip" + "sha1": "dbb771c2be299fd88ca05d8b0e381c369a7f7009", + "size": 6947111, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux_r02.0.rc2.zip" }, { "os": "macosx", - "sha1": "3adaf99d06eaeeb31f7bdbb62ae841e740bfc156", - "size": 5592023, - "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc1.zip" + "sha1": "ec1f68f9acc234f8493f4ba24954d1d45291b736", + "size": 8593497, + "url": "https://dl.google.com/android/repository/desktop-head-unit-macosx_r02.0.rc2.zip" }, { "os": "windows", - "sha1": "e07788ed91d8e6dd3374f77da1cf78afb2664cc0", - "size": 5703857, - "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc1.zip" + "sha1": "471ae94176512f859580e6ac9e8b8f5010632c78", + "size": 7130894, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows_r02.0.rc2.zip" } ], "displayName": "Android Auto Desktop Head Unit Emulator", "license": "android-sdk-preview-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0-rc1" + "revision": "2.0-rc2" } }, "ndk": { @@ -4136,6 +4157,114 @@ "name": "ndk", "path": "ndk/23.0.7272597", "revision": "23.0.7272597-rc3" + }, + "23.0.7344513-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", + "size": 724510864, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", + "size": 785615074, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7344513", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7344513", + "revision": "23.0.7344513-rc4" + }, + "23.0.7421159-rc5": { + "archives": [ + { + "os": "macosx", + "sha1": "9ef60fcc7a4bb0477d4189c711853cbc12b24efe", + "size": 694850942, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-darwin.zip" + }, + { + "os": "linux", + "sha1": "453ba0ca124e43337318f8a40d26cab114e7092c", + "size": 724438684, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-linux.zip" + }, + { + "os": "windows", + "sha1": "ace75623181ce86bc70df312155c04b9d8ff3e46", + "size": 785543078, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7421159", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7421159", + "revision": "23.0.7421159-rc5" + }, + "23.0.7530507-rc6": { + "archives": [ + { + "os": "macosx", + "sha1": "af299c3e4f6fd3e6f05b1699a0181d84a95068c4", + "size": 695336572, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-darwin.zip" + }, + { + "os": "linux", + "sha1": "b3118a9daeff8ad1801c4dbaeda1e5e5fb33b8a5", + "size": 725026229, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-linux.zip" + }, + { + "os": "windows", + "sha1": "386f5c80217f6f33d6420f7de4f935eaff831868", + "size": 786033634, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7530507", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/23.0.7530507", + "revision": "23.0.7530507-rc6" + }, + "23.0.7599858": { + "archives": [ + { + "os": "macosx", + "sha1": "c19f4a29e03689ea31bebe77f2d0a256d8e16925", + "size": 691981924, + "url": "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip" + }, + { + "os": "linux", + "sha1": "9bad35f442caeda747780ba1dd92f2d98609d9cd", + "size": 721667870, + "url": "https://dl.google.com/android/repository/android-ndk-r23-linux.zip" + }, + { + "os": "windows", + "sha1": "14af52e23af9f7a9e7576a17e1814701192745be", + "size": 782684423, + "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.0.7599858", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/23.0.7599858", + "revision": "23.0.7599858" } }, "ndk-bundle": { @@ -4786,6 +4915,33 @@ "name": "ndk-bundle", "path": "ndk-bundle", "revision": "23.0.7272597-rc3" + }, + "23.0.7344513-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" + }, + { + "os": "linux", + "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", + "size": 724510864, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" + }, + { + "os": "windows", + "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", + "size": 785615074, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" + } + ], + "displayName": "NDK", + "license": "android-sdk-preview-license", + "name": "ndk-bundle", + "path": "ndk-bundle", + "revision": "23.0.7344513-rc4" } }, "patcher": { @@ -4806,32 +4962,32 @@ } }, "platform-tools": { - "31.0.2": { + "31.0.3": { "archives": [ { "os": "macosx", - "sha1": "78937049851e1db90317612c6b831759f56fc86d", - "size": 13829393, - "url": "https://dl.google.com/android/repository/42b081e1e068bb936179551684cdcb30315e245c.platform-tools_r31.0.2-darwin.zip" + "sha1": "15f6f7e97b35994d538a0fc5147ad5fb502ba03d", + "size": 13227985, + "url": "https://dl.google.com/android/repository/e8b2b4cbe47c728c1e54c5f524440b52d4e1a33c.platform-tools_r31.0.3-darwin.zip" }, { "os": "linux", - "sha1": "ff02a9d8c6fa9687e1207fc0c4b84033925d452d", - "size": 13876419, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-linux.zip" + "sha1": "f09581347ed39978abb3a99c6bb286de6adc98ef", + "size": 13302579, + "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-linux.zip" }, { "os": "windows", - "sha1": "9cc0f642a66706a978214395b85c8e8228c24f2f", - "size": 12537668, - "url": "https://dl.google.com/android/repository/platform-tools_r31.0.2-windows.zip" + "sha1": "26bc02bbd920e8ed461ae526cc4c69d773b72395", + "size": 11912013, + "url": "https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip" } ], "displayName": "Android SDK Platform-Tools", "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "31.0.2" + "revision": "31.0.3" } }, "platforms": { @@ -5204,6 +5360,21 @@ "path": "platforms/android-30", "revision": "30" }, + "31": { + "archives": [ + { + "os": "all", + "sha1": "ca5bcaa565cb37e9d287051d6dd0e49a5426ec29", + "size": 56475526, + "url": "https://dl.google.com/android/repository/platform-31_r01.zip" + } + ], + "displayName": "Android SDK Platform 31", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-31", + "revision": "31" + }, "4": { "archives": [ { @@ -5329,50 +5500,35 @@ "name": "platforms", "path": "platforms/android-9", "revision": "9" - }, - "S": { - "archives": [ - { - "os": "all", - "sha1": "3aee3ad760dc7becf657d6421629fe360215f92e", - "size": 56206479, - "url": "https://dl.google.com/android/repository/platform-S_r03.zip" - } - ], - "displayName": "Android SDK Platform S", - "license": "android-sdk-license", - "name": "platforms", - "path": "platforms/android-S", - "revision": "S" } }, "skiaparser": { - "2": { + "3": { "archives": [ { "os": "linux", - "sha1": "2703a570224a5ced1f73eb3efbdb3192a1ecec81", - "size": 6681896, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-linux.zip" + "sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41", + "size": 6767192, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip" }, { "os": "macosx", - "sha1": "ecf8794beccf578d4130bb9f7f2c7fa0c40c62c2", - "size": 7340904, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-mac.zip" + "sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468", + "size": 7401688, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip" }, { "os": "windows", - "sha1": "84c28480ca057e48e8d2fed0ae8f52fc21aa7e61", - "size": 6450856, - "url": "https://dl.google.com/android/repository/skiaparser-7248848-win.zip" + "sha1": "567f24512f9d9487a3b948032a136261f5d59c92", + "size": 6532776, + "url": "https://dl.google.com/android/repository/skiaparser-7478287-win.zip" } ], "displayName": "Layout Inspector image server for API S", "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", - "revision": "2" + "revision": "3" }, "6": { "archives": [ diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 6f4522ebf1c9..c7115baa422a 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,23 +1,27 @@ GEM + specs: + +GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.5) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.7.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) - addressable (~> 2.6) + cocoapods (1.11.0.beta.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.11.0.beta.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,66 +32,68 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.0.beta.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) - ruby-macho (1.4.0) - thread_safe (0.3.6) + rexml (3.2.5) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - xcodeproj (1.19.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.4.2) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods (>= 1.7.0.beta.1)! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index cf718b02c087..c29ad34d4efd 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,23 +1,26 @@ GEM + specs: + +GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.1) + cocoapods (1.10.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +35,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) + cocoapods-core (1.10.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -42,26 +45,26 @@ GEM netrc (~> 0.11) public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.15.0) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) @@ -70,24 +73,26 @@ GEM nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) + rexml (3.2.5) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.9) thread_safe (~> 0.1) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) PLATFORMS - ruby + arm64-darwin-20 DEPENDENCIES cocoapods! BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 9c18d393bcb9..b64d6b189ad5 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "5.2.4.5"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,20 +79,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0.beta.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { groups = ["default"]; @@ -182,20 +182,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -243,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6"; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; type = "gem"; }; - version = "0.6.6"; + version = "0.8.0"; }; nanaimo = { groups = ["default"]; @@ -318,25 +318,25 @@ }; version = "4.0.6"; }; - ruby-macho = { + rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "1.4.0"; + version = "3.2.5"; }; - thread_safe = { + ruby-macho = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch"; type = "gem"; }; - version = "0.3.6"; + version = "2.5.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -350,25 +350,35 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; + type = "gem"; + }; + version = "1.21.0"; + }; + zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "1.19.0"; + version = "2.4.2"; }; } diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 90c1687aeaba..7a6b63200281 100644 --- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.4.5"; + version = "5.2.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; + sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,20 +77,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; + sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; @@ -112,12 +112,14 @@ version = "1.0.0"; }; cocoapods-search = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -153,10 +155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; escape = { source = { @@ -172,20 +174,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; fourflusher = { groups = ["default"]; @@ -229,10 +231,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; json = { groups = ["default"]; @@ -298,6 +300,16 @@ }; version = "4.0.6"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; ruby-macho = { groups = ["default"]; platforms = []; @@ -339,14 +351,14 @@ version = "1.2.9"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; type = "gem"; }; - version = "1.19.0"; + version = "1.21.0"; }; } diff --git a/nixpkgs/pkgs/development/mobile/gomobile/default.nix b/nixpkgs/pkgs/development/mobile/gomobile/default.nix index 17b4e2fb3f62..ce44b7dd9345 100644 --- a/nixpkgs/pkgs/development/mobile/gomobile/default.nix +++ b/nixpkgs/pkgs/development/mobile/gomobile/default.nix @@ -3,21 +3,20 @@ , xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs , androidPkgs ? androidenv.composeAndroidPackages { includeNDK = true; - ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. + ndkVersion = "22.1.7171670"; } }: buildGoModule { pname = "gomobile"; - version = "unstable-2020-06-22"; + version = "unstable-2021-06-14"; - vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; + vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; src = fetchgit { - # WARNING: Next commit removes support for ARM 32 bit builds for iOS - rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5"; + rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; name = "gomobile"; url = "https://go.googlesource.com/mobile"; - sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; + sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; }; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; @@ -25,8 +24,6 @@ buildGoModule { # Fails with: go: cannot find GOROOT directory doCheck = false; - patches = [ ./resolve-nix-android-sdk.patch ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; @@ -48,8 +45,8 @@ buildGoModule { wrapProgram $out/bin/gomobile \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ --prefix PATH : "${androidPkgs.androidsdk}/bin" \ - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ - --set GOPATH $out + --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ + --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch deleted file mode 100644 index cc143e3a447c..000000000000 --- a/nixpkgs/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go -index 3b01adc..76216fa 100644 ---- a/cmd/gomobile/bind_androidapp.go -+++ b/cmd/gomobile/bind_androidapp.go -@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) { - var apiVer int - for _, fi := range fis { - name := fi.Name() -+ // Resolve symlinked directories (this is how the Nix Android SDK package is built) -+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil { -+ fi = fi2 -+ } - if !fi.IsDir() || !strings.HasPrefix(name, "android-") { - continue - } |