commit 386f53551cfbae340edfcd6938b8d806bd8a8ddb · pyrox.dev/nixpkgs

+6 -3

pkgs/build-support/fetchurl/builder.sh

···

       35
       35
        
       

     

       36
       36
        
       tryDownload() {

     

       37
       37
        
           local url="$1"

     

       38
       38
       +
           local target="$2"

     

       38
       39
        
           echo

     

       39
       40
        
           echo "trying $url"

     

       40
       41
        
           local curlexit=18;

     
···

       44
       45
        
           # if we get error code 18, resume partial download

     

       45
       46
        
           while [ $curlexit -eq 18 ]; do

     

       46
       47
        
              # keep this inside an if statement, since on failure it doesn't abort the script

     

       47
       47
       -
              if "${curl[@]}" -C - --fail "$url" --output "$downloadedFile"; then

     

       48
       48
       +
              if "${curl[@]}" -C - --fail "$url" --output "$target"; then

     

       48
       49
        
                 success=1

     

       49
       50
        
                 break

     

       50
       51
        
              else

     
···

       81
       82
        
               if "${curl[@]}" --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \

     

       82
       83
        
                   --fail --silent --show-error --head "$url" \

     

       83
       84
        
                   --write-out "%{http_code}" --output /dev/null > code 2> log; then

     

       84
       84
       -
                   tryDownload "$url"

     

       85
       85
       +
                   # Directly download to $out, because postFetch doesn't need to run,

     

       86
       86
       +
                   # since hashed mirrors provide pre-built derivation outputs.

     

       87
       87
       +
                   tryDownload "$url" "$out"

     

       85
       88
        
       

     

       86
       89
        
                   # We skip postFetch here, because hashed-mirrors are

     

       87
       90
        
                   # already content addressed. So if $outputHash is in the

     
···

       156
       159
        
                      ;;

     

       157
       160
        
              esac

     

       158
       161
        
           fi

     

       159
       159
       -
           tryDownload "$url"

     

       162
       162
       +
           tryDownload "$url" "$downloadedFile"

     

       160
       163
        
           if test -n "$success"; then finish; fi

     

       161
       164
        
       done

     

       162
       165

+20

pkgs/build-support/fetchurl/tests.nix

···

       22
       22
        
               ${jq}/bin/jq -r '.headers.Hello' $out | ${moreutils}/bin/sponge $out

     

       23
       23
        
             '';

     

       24
       24
        
           };

     

       25
       25
       +
         # Tests that downloadToTemp works with hashedMirrors

     

       26
       26
       +
         no-skipPostFetch = testers.invalidateFetcherByDrvHash fetchurl {

     

       27
       27
       +
           # Make sure that we can only download from hashed mirrors

     

       28
       28
       +
           url = "http://broken";

     

       29
       29
       +
           # A file with this hash is definitely on tarballs.nixos.org

     

       30
       30
       +
           sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";

     

       31
       31
       +
       

     

       32
       32
       +
           # No chance

     

       33
       33
       +
           curlOptsList = [

     

       34
       34
       +
             "--retry"

     

       35
       35
       +
             "0"

     

       36
       36
       +
           ];

     

       37
       37
       +
       

     

       38
       38
       +
           downloadToTemp = true;

     

       39
       39
       +
           # Usually postFetch is needed with downloadToTemp to populate $out from

     

       40
       40
       +
           # $downloadedFile, but here we know that because the URL is broken, it will

     

       41
       41
       +
           # have to fallback to fetching the previously-built derivation from

     

       42
       42
       +
           # tarballs.nixos.org, which provides pre-built derivation outputs.

     

       43
       43
       +
       

     

       44
       44
       +
         };

     

       25
       45
        
       }