2e6bf42a22
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299 |
||
---|---|---|
.. | ||
abootimg | ||
adb-sync | ||
adbfs-rootless | ||
androidenv | ||
cocoapods | ||
flashtool | ||
genymotion | ||
imgpatchtools | ||
titaniumenv | ||
webos | ||
xcodeenv | ||
xpwn |