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: aae21170ee59
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3fd87ad0073f
Choose a head ref
  • 5 commits
  • 10 files changed
  • 4 contributors

Commits on Nov 30, 2018

  1. androidsdk: 25.2.5 -> 26.1.1, license agreement 

    (cherry picked from commit 950608b)
    @nicknovitski @luigy
    nicknovitski authored and luigy committed Nov 30, 2018
    Copy the full SHA
    4822381 View commit details
    Browse the repository at this point in the history

  2. androidenv: version buildTools and add buildToolsVersions sdk argument 

    (cherry picked from commit d861da1)
    @nicknovitski @luigy
    nicknovitski authored and luigy committed Nov 30, 2018
    Copy the full SHA
    6d95328 View commit details
    Browse the repository at this point in the history

  3. androidsdk: fix monitor interpreter path 

    (cherry picked from commit c43abff)
    @corngood @luigy
    corngood authored and luigy committed Nov 30, 2018
    Copy the full SHA
    73ee651 View commit details
    Browse the repository at this point in the history

  4. androidsdk: Re-add emulator that was broken out of the sdk-tools pack… 

    …age.

(cherry picked from commit b4d9f6d)
    @clefru @luigy
    clefru authored and luigy committed Nov 30, 2018
    Copy the full SHA
    854e94d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2018

  1. Merge pull request #51286 from obsidiansystems/bump-android-sdk-backport 

    Bump android sdk backport in 18.09
    @Ericson2314
    Ericson2314 committed Dec 4, 2018
    Copy the full SHA
    3fd87ad View commit details
    Browse the repository at this point in the history