[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69328] [PATCH 12/12] download: Honor ‘GUIX_DOWNLOAD_SEQUENCE’ envir
From: |
Ludovic Courtès |
Subject: |
[bug#69328] [PATCH 12/12] download: Honor ‘GUIX_DOWNLOAD_SEQUENCE’ environment variable. |
Date: |
Tue, 05 Mar 2024 11:26:03 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Timothy Sample <samplet@ngyro.com> skribis:
> Ludovic Courtès <ludo@gnu.org> writes:
>
>> diff --git a/guix/scripts/perform-download.scm
>> b/guix/scripts/perform-download.scm
>> index b96959a09e..250b1c2b48 100644
>> --- a/guix/scripts/perform-download.scm
>> +++ b/guix/scripts/perform-download.scm
>> @@ -114,14 +120,16 @@ (define* (perform-git-download drv output
>> ;; on ambient authority, hence the PATH value below.
>> (setenv "PATH" "/run/current-system/profile/bin:/bin:/usr/bin")
>>
>> - ;; Note: When doing a '--check' build, DRV-OUTPUT and OUTPUT are
>> - ;; different, hence the #:item argument below.
>> - (git-fetch-with-fallback url commit output
>> - #:hash hash
>> - #:hash-algorithm algo
>> - #:recursive? recursive?
>> - #:item (derivation-output-path drv-output)
>> - #:git-command %git))))
>> + (parameterize ((%download-sequence
>> + (and download-sequence
>> + (call-with-input-string download-sequence
>> + read))))
>> + (git-fetch-with-fallback url commit output
>> + #:hash hash
>> + #:hash-algorithm algo
>> + #:recursive? recursive?
>> + #:item (derivation-output-path drv-output)
>> + #:git-command %git)))))
>
> Did you mean to delete the comment here?
Nope, good catch!