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

Commits on Mar 9, 2020

  1. Copy the full SHA
    12a9715 View commit details
    Browse the repository at this point in the history
  2. androidenv: update generate.sh to use nix-shell and fail on error

    Update generate.sh to run using nix-shell. Also make it fail with
    meaningful output instead of writing empty output files.
    
    This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
    
    This relies on the shebang being used.
    tadfisher authored and lucafavatella committed Mar 9, 2020
    Copy the full SHA
    6f80983 View commit details
    Browse the repository at this point in the history
  3. androidenv: fix system images xsl used in generate.sh

    Updated with fixes for `convertsystemimages.xsl`:
    - Use `type-details/codename` if it exists, falling back to
      `type-details/api-level`: this results in "Q" rather than "28" for
      preview images
    - Use `<xsl:text>` elements to control whitespace in the output.
    
    This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
    tadfisher authored and lucafavatella committed Mar 9, 2020
    Copy the full SHA
    d574ea4 View commit details
    Browse the repository at this point in the history
  4. androidenv: fix packages xsl used in generate.sh

    Entry `<remotePackage path="cmdline-tools;latest">` resulted in a
    duplicated `"cmdline-tools"."1.0"`.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    de119ca View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Merge pull request #82067 from lucafavatella/androidenv-generate

    androidenv: enhance script for the generated expressions
    svanderburg committed Mar 16, 2020
    Copy the full SHA
    52c89d0 View commit details
    Browse the repository at this point in the history