Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zlib: Fix zlib.net URL. #21753

Merged
merged 1 commit into from Jan 8, 2017
Merged

zlib: Fix zlib.net URL. #21753

merged 1 commit into from Jan 8, 2017

Conversation

sh01
Copy link
Contributor

@sh01 sh01 commented Jan 8, 2017

Look for primary source file below
http://zlib.net/fossils/ as opposed to
http://zlib.net/
. zlib-1.2.8.tar.gz is still available at the former location, and will likely
remain there. In addition, it's important that the first URL work since zlib
is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch
from later ones.

Motivation for this change

Bootstrap source tarball fetch is broken due the first URL going dark.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Look for primary source file below
  http://zlib.net/fossils/ as opposed to
  http://zlib.net/
. zlib-1.2.8.tar.gz is still available at the former location, and will likely
remain there. In addition, it's important that the first URL work since zlib
is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch
from later ones.
@mention-bot
Copy link

@sh01, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @vcunat and @grahamc to be potential reviewers.

@knedlsepp
Copy link
Member

It's unfortunate that they don't provide the most current version in the fossils directory. I'm not sure this is the best option. What would be best is of course to get NixOS/nix#821 working.

@sh01
Copy link
Contributor Author

sh01 commented Jan 8, 2017

That would definitely be nice. Still, this is a simple change right now, and IMO a major improvement in keeping this buildable as part of bootstrap; having it broken is causing me major pain (of the "patch local copy of nixpkgs to work around" kind).
It'll also keep working at least until the zlib version in nixpkgs is changed again.

@vcunat vcunat merged commit d042abe into NixOS:master Jan 8, 2017
vcunat pushed a commit that referenced this pull request Jan 8, 2017
Look for primary source file below
  http://zlib.net/fossils/ as opposed to
  http://zlib.net/
. zlib-1.2.8.tar.gz is still available at the former location, and will likely
remain there. In addition, it's important that the first URL work since zlib
is in the bootstrap path, and 16.09 (at least) bootstrap doesn't try to fetch
from later ones.
(cherry picked from commit d042abe)
@vcunat
Copy link
Member

vcunat commented Jan 8, 2017

I'm merging this now to both 16.09 and master. We can always improve further...

BTW, this weekend I updated zlib in staging 948e9ed, but it might be necessary to delay that from master for now.

@sh01 sh01 deleted the zlib_url_fix branch January 9, 2017 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants