commit 807356fa6960fa76767ee7b696530cf5c671bd62 · pyrox.dev/nixpkgs

+1 -3

pkgs/development/mobile/androidenv/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         config,

     

       4
       3
        
         pkgs ? import <nixpkgs> { },

     

       5
       5
       -
         licenseAccepted ?

     

       6
       6
       -
           config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),

     

       4
       4
       +
         licenseAccepted ? pkgs.callPackage ./license.nix { },

     

       7
       5
        
       }:

     

       8
       6
        
       

     

       9
       7
        
       lib.recurseIntoAttrs rec {

+3 -5

pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix

···

       19
       19
        
           config.allowUnfree = true;

     

       20
       20
        
         },

     

       21
       21
        
       

     

       22
       22
       -
         config ? pkgs.config,

     

       23
       22
        
         # You probably need to set it to true to express consent.

     

       24
       24
       -
         licenseAccepted ?

     

       25
       25
       -
           config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),

     

       23
       23
       +
         licenseAccepted ? pkgs.callPackage ../license.nix { },

     

       26
       24
        
       }:

     

       27
       25
        
       

     

       28
       26
        
       # Copy this file to your Android project.

     
···

       36
       34
        
           };

     

       37
       35
        
       

     

       38
       36
        
           androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {

     

       39
       39
       -
             inherit config pkgs;

     

       37
       37
       +
             inherit pkgs;

     

       40
       38
        
             licenseAccepted = true;

     

       41
       39
        
           };

     

       42
       40
        
         */

     

       43
       41
        
       

     

       44
       42
        
         # Otherwise, just use the in-tree androidenv:

     

       45
       43
        
         androidEnv = pkgs.callPackage ./.. {

     

       46
       46
       -
           inherit config pkgs licenseAccepted;

     

       44
       44
       +
           inherit pkgs licenseAccepted;

     

       47
       45
        
         };

     

       48
       46
        
       

     

       49
       47
        
         emulatorSupported = pkgs.stdenv.hostPlatform.isx86_64 || pkgs.stdenv.hostPlatform.isDarwin;

+12 -14

pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix

···

       5
       5
        
         # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html

     

       6
       6
        
         /*

     

       7
       7
        
           nixpkgsSource ? (builtins.fetchTarball {

     

       8
       8
       -
           name = "nixpkgs-20.09";

     

       9
       9
       -
           url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";

     

       10
       10
       -
           sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";

     

       8
       8
       +
             name = "nixpkgs-20.09";

     

       9
       9
       +
             url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";

     

       10
       10
       +
             sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";

     

       11
       11
        
           }),

     

       12
       12
        
           pkgs ? import nixpkgsSource {

     

       13
       13
       -
           config.allowUnfree = true;

     

       13
       13
       +
             config.allowUnfree = true;

     

       14
       14
        
           },

     

       15
       15
        
         */

     

       16
       16
        
       

     
···

       18
       18
        
         pkgs ? import ../../../../.. {

     

       19
       19
        
           config.allowUnfree = true;

     

       20
       20
        
         },

     

       21
       21
       -
         config ? pkgs.config,

     

       22
       22
       -
         # You probably need to set it to true to express consent.

     

       23
       23
       -
         licenseAccepted ?

     

       24
       24
       -
           config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),

     

       21
       21
       +
       

     

       22
       22
       +
         licenseAccepted ? pkgs.callPackage ../license.nix { },

     

       25
       23
        
       }:

     

       26
       24
        
       

     

       27
       25
        
       # Copy this file to your Android project.

     
···

       29
       27
        
         # If you copy this example out of nixpkgs, something like this will work:

     

       30
       28
        
         /*

     

       31
       29
        
           androidEnvNixpkgs = fetchTarball {

     

       32
       32
       -
           name = "androidenv";

     

       33
       33
       -
           url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";

     

       34
       34
       -
           sha256 = "<fill me in with nix-prefetch-url --unpack>";

     

       30
       30
       +
             name = "androidenv";

     

       31
       31
       +
             url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz";

     

       32
       32
       +
             sha256 = "<fill me in with nix-prefetch-url --unpack>";

     

       35
       33
        
           };

     

       36
       34
        
       

     

       37
       35
        
           androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {

     

       38
       38
       -
           inherit config pkgs;

     

       39
       39
       -
           licenseAccepted = true;

     

       36
       36
       +
             inherit pkgs;

     

       37
       37
       +
             licenseAccepted = true;

     

       40
       38
        
           };

     

       41
       39
        
         */

     

       42
       40
        
       

     

       43
       41
        
         # Otherwise, just use the in-tree androidenv:

     

       44
       42
        
         androidEnv = pkgs.callPackage ./.. {

     

       45
       45
       -
           inherit config pkgs licenseAccepted;

     

       43
       43
       +
           inherit pkgs licenseAccepted;

     

       46
       44
        
         };

     

       47
       45
        
       

     

       48
       46
        
         sdkArgs = {

+3 -5

pkgs/development/mobile/androidenv/examples/shell.nix

···

       17
       17
        
           config.allowUnfree = true;

     

       18
       18
        
         },

     

       19
       19
        
       

     

       20
       20
       -
         config ? pkgs.config,

     

       21
       20
        
         # You probably need to set it to true to express consent.

     

       22
       22
       -
         licenseAccepted ?

     

       23
       23
       -
           config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),

     

       21
       21
       +
         licenseAccepted ? pkgs.callPackage ../license.nix { },

     

       24
       22
        
       }:

     

       25
       23
        
       

     

       26
       24
        
       # Copy this file to your Android project.

     
···

       34
       32
        
           };

     

       35
       33
        
       

     

       36
       34
        
           androidEnv = pkgs.callPackage "${androidEnvNixpkgs}/pkgs/development/mobile/androidenv" {

     

       37
       37
       -
             inherit config pkgs;

     

       35
       35
       +
             inherit pkgs;

     

       38
       36
        
             licenseAccepted = true;

     

       39
       37
        
           };

     

       40
       38
        
         */

     

       41
       39
        
       

     

       42
       40
        
         # Otherwise, just use the in-tree androidenv:

     

       43
       41
        
         androidEnv = pkgs.callPackage ./.. {

     

       44
       44
       -
           inherit config pkgs licenseAccepted;

     

       42
       42
       +
           inherit pkgs licenseAccepted;

     

       45
       43
        
         };

     

       46
       44
        
       

     

       47
       45
        
         # The head unit only works on these platforms

+9

pkgs/development/mobile/androidenv/license.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       # Accept the license in the test suite.

     

       6
       6
       +
       config.android_sdk.accept_license or (

     

       7
       7
       +
         builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"

     

       8
       8
       +
         || builtins.getEnv "UPDATE_NIX_ATTR_PATH" == "androidenv.test-suite"

     

       9
       9
       +
       )

+8 -7

pkgs/development/mobile/androidenv/mkrepo.rb

···

       529
       529
        
         end

     

       530
       530
        
       end

     

       531
       531
        
       

     

       532
       532
       +
       # Write the repository. Append a \n to keep nixpkgs Github Actions happy.

     

       533
       533
       +
       File.write 'repo.json', (JSON.pretty_generate(sort_recursively(output)) + "\n")

     

       534
       534
       +
       

     

       532
       535
        
       # Output metadata for the nixpkgs update script.

     

       533
       536
        
       changed_paths = []

     

       534
       537
        
       if changed

     

       535
       538
        
         if ENV['UPDATE_NIX_ATTR_PATH']

     

       536
       539
        
           # Instantiate it.

     

       537
       537
       -
           test_result = `nix-shell ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`

     

       540
       540
       +
           test_result = `NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 nix-build ../../../../default.nix -A #{Shellwords.join [ENV['UPDATE_NIX_ATTR_PATH']]} 2>&1`

     

       538
       541
        
           test_status = $?.exitstatus

     

       539
       542
        
           tests_ran = true

     

       540
       543
        
         else

     
···

       553
       556
        
       <% if tests_ran %>

     

       554
       557
        
       Tests exited with status: <%= test_status -%>

     

       555
       558
        
       

     

       556
       556
       -
       <% if test_status != 0 %>

     

       559
       559
       +
       <% if !test_result.empty? %>

     

       560
       560
       +
       Last 100 lines of output:

     

       557
       561
        
       ```

     

       558
       558
       -
       <%= test_result -%>

     

       562
       562
       +
       <%= test_result.lines.last(100).join -%>

     

       559
       563
        
       ```

     

       560
       564
        
       <% end %>

     

       561
       565
        
       <% end %>

     
···

       573
       577
        
       end

     

       574
       578
        
       

     

       575
       579
        
       # nix-update info is on stderr

     

       576
       576
       -
       STDERR.puts JSON.pretty_generate(changed_paths)

     

       577
       577
       -
       

     

       578
       578
       -
       # repo is on stdout

     

       579
       579
       -
       STDOUT.puts JSON.pretty_generate(sort_recursively(output))

     

       580
       580
       +
       STDOUT.puts JSON.pretty_generate(changed_paths)

+1 -4

pkgs/development/mobile/androidenv/mkrepo.sh

···

       6
       6
        
       pushd "$(dirname "$0")" &>/dev/null || exit 1

     

       7
       7
        
       

     

       8
       8
        
       echo "Writing repo.json" >&2

     

       9
       9
       -
       pid=$BASHPID

     

       10
       9
        
       ruby mkrepo.rb \

     

       11
       10
        
           --packages ./xml/repository2-3.xml \

     

       12
       11
        
           --images ./xml/android-sys-img2-3.xml \

     
···

       16
       15
        
           --images ./xml/android-automotive-sys-img2-3.xml \

     

       17
       16
        
           --images ./xml/google_apis-sys-img2-3.xml \

     

       18
       17
        
           --images ./xml/google_apis_playstore-sys-img2-3.xml \

     

       19
       19
       -
           --addons ./xml/addon2-3.xml <./repo.json 2>/proc/$pid/fd/1 \

     

       20
       20
       -
                | sponge repo.json

     

       21
       21
       -
       

     

       18
       18
       +
           --addons ./xml/addon2-3.xml <./repo.json

     

       22
       19
        
       popd &>/dev/null