tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

git-download: Use “builtin:git-download” when available.

Browse Source 
Fixes <https://issues.guix.gnu.org/63331>.

Longer-term this will remove Git from the derivation graph when its sole
use is to perform a checkout for a fixed-output derivation, thereby
breaking dependency cycles that can arise in these situations.

* guix/git-download.scm (git-fetch): Rename to…
(git-fetch/in-band): … this.  Deal with GIT or GUILE being #f.
(git-fetch/built-in, built-in-builders*, git-fetch): New procedures.
* tests/builders.scm ("git-fetch, file URI"): New test.
This commit is contained in:
Ludovic Courtès
2023-09-11 15:28:09 +02:00
parent c4a1d69a69
commit 13b0cf85eb
2 changed files with 91 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/builders.scm
View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2015, 2018-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;;
;;; This file is part of GNU Guix.
@@ -20,6 +20,7 @@
(define-module (tests builders)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
#:use-module (guix build gnu-build-system)
@@ -31,9 +32,12 @@
#:use-module (guix base32)
#:use-module (guix derivations)
#:use-module (gcrypt hash)
#:use-module ((guix hash) #:select (file-hash*))
#:use-module (guix tests)
#:use-module (guix tests git)
#:use-module (guix packages)
#:use-module (gnu packages bootstrap)
#:use-module ((ice-9 ftw) #:select (scandir))
#:use-module (ice-9 match)
#:use-module (ice-9 textual-ports)
#:use-module (srfi srfi-1)
@@ -84,6 +88,29 @@
(and (file-exists? out)
(valid-path? %store out))))
(test-equal "git-fetch, file URI"
'("." ".." "a.txt" "b.scm")
(let ((nonce (random-text)))
(with-temporary-git-repository directory
`((add "a.txt" ,nonce)
(add "b.scm" "#t")
(commit "Commit.")
(tag "v1.0.0" "The tag."))
(run-with-store %store
(mlet* %store-monad ((hash
-> (file-hash* directory
#:algorithm (hash-algorithm sha256)
#:recursive? #t))
(drv (git-fetch
(git-reference
(url (string-append "file://" directory))
(commit "v1.0.0"))
'sha256 hash
"git-fetch-test")))
(mbegin %store-monad
(built-derivations (list drv))
(return (scandir (derivation->output-path drv)))))))))
(test-assert "gnu-build-system"
(build-system? gnu-build-system))