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: e04a39d550ff
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5be571eea1e3
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 17, 2019

  1. androidenv: fix deployment of google_apis* system images 

    Fixes #56866
    @erikarvstedt
    erikarvstedt committed Aug 17, 2019
    Copy the full SHA
    e48d97f View commit details
    Browse the repository at this point in the history

  2. androidenv/emulate-app: fix passing extra args to the sdk composition 

    This feature was originally intended but left unfinished, as indicated
by the unused variables 'args' and 'androidSdkArgNames'.
    @erikarvstedt
    erikarvstedt committed Aug 17, 2019
    Copy the full SHA
    0dab612 View commit details
    Browse the repository at this point in the history

  3. manual/android: add Play Store to emulator example 

    This system type was previously broken but is now fixed.
Add it here to showcase the common task of launching a fully-fledged Android
system with an included app store.
    @erikarvstedt
    erikarvstedt committed Aug 17, 2019
    Copy the full SHA
    4daca65 View commit details
    Browse the repository at this point in the history

  4. androidenv/emulate-app: rename androidsdkComposition -> sdk 

    This greatly improves readability by shortening some of the overlong lines.
    @erikarvstedt
    erikarvstedt committed Aug 17, 2019
    Copy the full SHA
    2ec43d3 View commit details
    Browse the repository at this point in the history

  5. androidenv: rename stdenv.lib -> lib 

    Removes some visual clutter.
    @erikarvstedt
    erikarvstedt committed Aug 17, 2019
    Copy the full SHA
    1b81302 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Merge pull request #66747 from erikarvstedt/androidenv-fixes 

    Androidenv fixes
    @matthewbauer
    matthewbauer committed Aug 20, 2019
    Copy the full SHA
    5be571e View commit details
    Browse the repository at this point in the history