diff options
Diffstat (limited to 'nixpkgs/pkgs/build-support/fetchurl')
| -rw-r--r-- | nixpkgs/pkgs/build-support/fetchurl/builder.sh | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/build-support/fetchurl/mirrors.nix | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/fetchurl/builder.sh b/nixpkgs/pkgs/build-support/fetchurl/builder.sh index f9bc8b602f4c..74fdc320835f 100644 --- a/nixpkgs/pkgs/build-support/fetchurl/builder.sh +++ b/nixpkgs/pkgs/build-support/fetchurl/builder.sh @@ -118,7 +118,6 @@ if test -n "$showURLs"; then exit 0 fi - if test -n "$preferHashedMirrors"; then tryHashedMirrors fi @@ -128,6 +127,16 @@ set -o noglob success= for url in $urls; do + if [ -z "$postFetch" ]; then + case "$url" in + https://github.com/*/archive/*) + echo "warning: archives from GitHub revisions should use fetchFromGitHub" + ;; + https://gitlab.com/*/-/archive/*) + echo "warning: archives from GitLab revisions should use fetchFromGitLab" + ;; + esac + fi tryDownload "$url" if test -n "$success"; then finish; fi done diff --git a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix index 404c744eea2a..404cea7532bf 100644 --- a/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix +++ b/nixpkgs/pkgs/build-support/fetchurl/mirrors.nix @@ -308,6 +308,8 @@ rec { hackage = [ http://hackage.haskell.org/package/ http://hdiff.luite.com/packages/archive/package/ + http://hackage.fpcomplete.com/package/ + http://objects-us-east-1.dream.io/hackage-mirror/package/ ]; # Roy marples mirrors |