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
base: 6d34e36ed7a9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0c1ee96a8992
Choose a head ref
  • 9 commits
  • 19 files changed
  • 2 contributors

Commits on Oct 25, 2018

  1. androidsdk: 25.2.5 -> 26.1.1, license agreement

    @nicknovitski
    nicknovitski committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    950608b View commit details
    Browse the repository at this point in the history

  2. androidenv.buildtools: 28.0.2 -> 28.0.3

    @nicknovitski
    nicknovitski committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    ad501e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. androidenv.buildTools: patch hard-coded /bin/ls paths

    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    f5c2960 View commit details
    Browse the repository at this point in the history

  2. androidenv.androidndk: patch prebuilt 64bit binaries

    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    ec8f320 View commit details
    Browse the repository at this point in the history

  3. androidenv: remove android command from fetch.sh 

    It's deprecated, and no longer prints the urls of any xml files for the script
to parse.
    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    6e07691 View commit details
    Browse the repository at this point in the history

  4. androidenv: run ./fetch.sh 

    Manually corrected three problems:
- fetch.sh: android cli cannot find java executable
- addons.nix: google_apis_25 expression not added correctly
- addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    a61f31c View commit details
    Browse the repository at this point in the history

  5. androidenv: add androidsdk_{8_1,9_0}{,_extras}

    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    4a0ae5d View commit details
    Browse the repository at this point in the history

  6. androidenv: version buildTools and add buildToolsVersions sdk argument

    @nicknovitski
    nicknovitski committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    d861da1 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Merge pull request #48848 from nicknovitski/android-sdk-26-licenses 

    Update android sdk, add license config option and selectable build tools
    @Mic92
    Mic92 committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    0c1ee96 View commit details
    Browse the repository at this point in the history