androidenv: enhance script for the generated expressions #82067
Conversation
lucafavatella
force-pushed
the
androidenv-generate
branch
from
a11ba47
to
1e8e9a1
Compare
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.
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.
lucafavatella
force-pushed
the
androidenv-generate
branch
from
1e8e9a1
to
ecdd90f
Compare
Entry `<remotePackage path="cmdline-tools;latest">` resulted in a duplicated `"cmdline-tools"."1.0"`.
lucafavatella
force-pushed
the
androidenv-generate
branch
from
ecdd90f
to
de119ca
Compare
|
@tadfisher @svanderburg @numinit These are |
|
As evident in PR #82118, in order to smoke test successfully the expressions generated by the script amended in this PR (that are not in this PR, but in #82118 ) I had to manually delete a few of the generated entries. I suggest not to wait for the process to be fully implemented as automated before we merge PRs otherwise PRs may stay hanging (then requiring new rebase and review ...). |
|
These can go in. The smoke tests succeed and changes make sense. @lucafavatella I will make some updates to my tests. I noticed that the documentation is slightly outdated here and there. |
|
About the generation: it seems that we are facing all kinds of new problems compared to several months ago. I did some investigation and the sad conclusion is that you need some kind of imperative program to properly process it. Some packages, for example, have the same name and version identifiers, but different zip files. For example some entries are split between operaing systems. The XSL stylesheets make the assumption that there is only one entry per package/version. That used to work in 99% of all cases, but now it seems that the amount of packages that deviate from this has grown. It seems that Google also has weird ways to configure package repository metadata. I think manual tweaking for now is unavoidable, until we have adjusted the XSL stylesheets to become more robust. Or when we have come up with a more robust conversion strategy, So I agree, let's just integrate this. As long as the test pass I'm fine with it. |
|
I'll also add to my personal TODO list to investigate the conversion process so that we actually can get the conversion done without tweaking, but I need to find the time for that :) |
Motivation for this change
Make the generation of androidenv generated expressions more reproducible.
This started by extracting the non-controversial bits from PR #58131 , that almost got approval in Apr 2019 but was not merged for the presence of bits requiring further refinement.
(I was considering to propose an unrelated androidenv PR and I read in the PR template re helping reviewing PRs, so I am triaging androidenv-related PRs and trying to bring them forward.)
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"- Not applicable./result/bin/) - Not applicablenix path-info -Sbefore and after) - Not applicable