Attemt at cleaning up nighty packaging after https://github.com/JuliaLang/julia/pull/5095

Hope this is correct and works. I have not tried it, but the changes seem obvious.