Unverified Commit aa9a2250 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

fetchurl: add passthru resolvedUrl 

This can be used to resolve mirror:// style URLs to a full URL any http
tool understands.
parent 4d69954e

pkgs/build-support/fetchurl/default.nix

+13 −1
Original line number Diff line number Diff line
@@ -192,6 +192,18 @@ let 
      }

    else

      throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty urls_}";



  resolvedUrl =

    let

      mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url;

      mirrorName = lib.head mirrorSplit;

      mirrorList =

        if lib.hasAttr mirrorName mirrors then

          mirrors."${mirrorName}"

        else

          throw "unknown mirror:// site ${mirrorName}";

    in

    if mirrorName == null then url else "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";

in



assert
@@ -279,7 +291,7 @@ stdenvNoCC.mkDerivation ( 


    inherit meta;

    passthru = {

      inherit url;

      inherit url resolvedUrl;

    }

    // passthru;

  }