diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 22:31:25 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-10 00:05:58 +0100 |
| commit | 2ee54513196bad8e663e78ac695b6ffa0da49051 (patch) | |
| tree | 4686b32c86fd484da0acfa35da69454659504cf7 /guix/git-download.scm | |
| parent | fe2b2f860e1fd7dfdc333f65893e65f131e290c7 (diff) | |
| parent | 7b9a23ea315d2b4efde755c3bd0b1db3cacba9c2 (diff) | |
| download | guix-2ee54513196bad8e663e78ac695b6ffa0da49051.tar guix-2ee54513196bad8e663e78ac695b6ffa0da49051.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'guix/git-download.scm')
| -rw-r--r-- | guix/git-download.scm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/guix/git-download.scm b/guix/git-download.scm index aadcbd234c..d26a814e07 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -29,8 +29,8 @@ #:use-module (guix packages) #:use-module (guix modules) #:use-module ((guix derivations) #:select (raw-derivation)) + #:autoload (guix download) (%download-methods) #:autoload (guix build-system gnu) (standard-packages) - #:autoload (guix download) (%download-fallback-test) #:autoload (git bindings) (libgit2-init!) #:autoload (git repository) (repository-open repository-close! @@ -180,11 +180,7 @@ respective documentation." ;; downloads. #:script-name "git-download" #:env-vars - `(("git url" . ,(match (%download-fallback-test) - ('content-addressed-mirrors - "https://example.org/does-not-exist") - (_ - (git-reference-url ref)))) + `(("git url" . ,(git-reference-url ref)) ("git commit" . ,(git-reference-commit ref)) ("git recursive?" . ,(object->string (git-reference-recursive? ref))) @@ -246,14 +242,14 @@ download by itself using its own dependencies." #:recursive? #t #:env-vars `(("url" . ,(object->string - (match (%download-fallback-test) - ('content-addressed-mirrors - "https://example.org/does-not-exist") - (_ - (git-reference-url ref))))) + (git-reference-url ref))) ("commit" . ,(git-reference-commit ref)) ("recursive?" . ,(object->string - (git-reference-recursive? ref)))) + (git-reference-recursive? ref))) + ,@(if (%download-methods) + `(("download-methods" + . ,(object->string (%download-methods)))) + '())) #:leaked-env-vars '("http_proxy" "https_proxy" "LC_ALL" "LC_MESSAGES" "LANG" "COLUMNS") |