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

fetchurl: fix and add extra KDE mirrors #51480

Merged
merged 3 commits into from Dec 8, 2018
Merged

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Dec 3, 2018

  • The gwdg.de mirror has moved the relative path of its KDE tarballs
  • Add new mirrors from Berkeley and MIT, which are on the list of officially supported mirrors

https://download.kde.org/extra/download-mirrors.html

Motivation for this change

I had some issues downloading KDE source tarballs with the existing mirrors; at least 1 of them is broken, and fixed here. The newly added ones work.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

- The gwdg.de mirror has moved the relative path of its KDE tarballs
- Add new mirrors from Berkeley and MIT, which are on the list of officially supported mirrors

https://download.kde.org/extra/download-mirrors.html
@@ -73,7 +73,9 @@ rec {
# Mirrors of ftp://ftp.kde.org/pub/kde/.
kde = [
"http://download.kde.org/download.php?url="
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we also do

Suggested change
"http://download.kde.org/download.php?url="
"https://download.kde.org/download.php?url="

Note that it's a redirect anyway:

> http -h http://download.kde.org/download.php
HTTP/1.1 301 Moved Permanently
[...]
Location: https://download.kde.org/download.php

@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 3, 2018

Also consider adding one HTTP mirror from Asia for users on this side of the world?

- The official one is a redirect to HTTPS anyways, so go directly to HTTPS
- Add China USTC for Asian users
- Swap Finland university from FTP to HTTP
"http://download.kde.org/download.php?url="
http://ftp.gwdg.de/pub/x11/kde/
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
ftp://ftp.kde.org/pub/kde/
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one's redundant, since we already have the HTTPS kde.org

kde = [
"http://download.kde.org/download.php?url="
http://ftp.gwdg.de/pub/x11/kde/
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one does not appear to be online, as far as I can tell; removed

http://ftp.gwdg.de/pub/x11/kde/
ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
ftp://ftp.kde.org/pub/kde/
ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swapped to HTTP, which is likely faster, and more likely to make it through firewalls.

@c0bw3b
Copy link
Contributor

c0bw3b commented Dec 3, 2018

LGTM.
I would maybe have kept one FTP mirror at the end of the list, for the unlikely scenario where everyone's httpd goes unreachable but ftp daemons are still up. But minor nitpick.

@c0bw3b c0bw3b merged commit 8dbc8e5 into NixOS:master Dec 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants