[PATCH 0/8] Add built-in builder for Git checkouts

index deda10fee8..0ff263c81b 100644

;;; GNU Guix --- Functional package management for GNU

;;;

;;; This file is part of GNU Guix.

;;;

(define-module (guix build git)

#:use-module (guix build utils)

#:use-module (srfi srfi-34)

#:use-module (ice-9 format)

;;; Commentary:

;;;

(delete-file-recursively ".git")

#t)))

;;; git.scm ends here

diff --git a/guix/git-download.scm b/guix/git-download.scm

index d88f4c40ee..8989b1b463 100644

(define modules

(delete '(guix config)

(source-module-closure '((guix build git)

(define build

(with-imported-modules modules

guile-lzlib)

#~(begin

(use-modules (guix build git)

(ice-9 match))

(define recursive?

(setvbuf (current-output-port) 'line)

(setvbuf (current-error-port) 'line)

(mlet %store-monad ((guile (package->derivation guile system)))

(gexp->derivation (or name "git-checkout") build

--

2.41.0

index 8989b1b463..f1f19397c6 100644

#:use-module (guix packages)

#:use-module (guix modules)

#:autoload (guix build-system gnu) (standard-packages)

#:autoload (git bindings) (libgit2-init!)

#:autoload (git repository) (repository-open

repository-close!

;; downloads.

#:script-name "git-download"

#:env-vars

("git commit" . ,(git-reference-commit ref))

("git recursive?" . ,(object->string

(git-reference-recursive? ref))))

--

2.41.0

index 6889bcef79..c8f044e82e 100644

(match args

(((? derivation-path? drv) (? store-path? output))

(assert-low-privileges)

(("--version")

(show-version-and-exit))

(x

--

2.41.0

index c8f044e82e..a287e97528 100644

;;; GNU Guix --- Functional package management for GNU

;;;

;;; This file is part of GNU Guix.

;;;

#:use-module (guix scripts)

#:use-module (guix derivations)

#:use-module ((guix store) #:select (derivation-path? store-path?))

#:use-module (ice-9 match)

#:export (guix-perform-download))

(drv-output (assoc-ref (derivation-outputs drv) "out"))

(algo (derivation-output-hash-algo drv-output))

(hash (derivation-output-hash drv-output)))

;; We're invoked by the daemon, which gives us write access to OUTPUT.

(when (url-fetch url output

#:print-build-trace? print-build-trace?

(when (and executable (string=? executable "1"))

(chmod output #o755))))))

(define (assert-low-privileges)

(when (zero? (getuid))

(leave (G_ "refusing to run with elevated privileges (UID ~a)~%")

(match args

(((? derivation-path? drv) (? store-path? output))

(assert-low-privileges)

(("--version")

(show-version-and-exit))

(x

diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc

index 4111ac4760..6bf467354a 100644

/* GNU Guix --- Functional package management for GNU

This file is part of GNU Guix.

static const std::map<std::string, derivationBuilder> builtins =

{

};

derivationBuilder lookupBuiltinBuilder(const std::string & name)

diff --git a/tests/derivations.scm b/tests/derivations.scm

index 66c777cfe7..e1312bd46b 100644

#:use-module (guix utils)

#:use-module ((gcrypt hash) #:prefix gcrypt:)

#:use-module (guix base32)

#:use-module (guix tests)

#:use-module (guix tests http)

#:use-module ((guix packages) #:select (package-derivation base32))

#:use-module (gnu packages bootstrap)

#:use-module ((gnu packages guile) #:select (guile-1.8))

#:use-module (srfi srfi-1)

(stat:ino (lstat file2))))))))

(test-equal "built-in-builders"

(built-in-builders %store))

(test-assert "unknown built-in builder"

get-string-all)

text))))))

(test-equal "derivation-name"

"foo-0.0"

(let ((drv (derivation %store "foo-0.0" %bash '())))

--

2.41.0

index a287e97528..e1c584fbda 100644

#:use-module ((guix store) #:select (derivation-path? store-path?))

#:autoload (guix build download) (url-fetch)

#:autoload (guix build git) (git-fetch-with-fallback)

#:use-module (ice-9 match)

#:export (guix-perform-download))

(algo (derivation-output-hash-algo drv-output))

(hash (derivation-output-hash drv-output)))

(git-fetch-with-fallback url commit output

(define (assert-low-privileges)

(when (zero? (getuid))

--

2.41.0

index f1f19397c6..505dff0a89 100644

#:use-module (guix records)

#:use-module (guix packages)

#:use-module (guix modules)

#:autoload (guix build-system gnu) (standard-packages)

#:autoload (guix download) (%download-fallback-test)

#:autoload (git bindings) (libgit2-init!)

(let ((distro (resolve-interface '(gnu packages version-control))))

(module-ref distro 'git-minimal)))

(define inputs

;; When doing 'git clone --recursive', we need sed, grep, etc. to be

;; available so that 'git submodule' works.

#:recursive? recursive?

#:git-command "git")))))

(gexp->derivation (or name "git-checkout") build

;; Use environment variables and a fixed script name so

#:recursive? #t

#:guile-for-build guile)))

(define (git-version version revision commit)

"Return the version string for packages using git-download."

;; git-version is almost exclusively executed while modules are being loaded.

diff --git a/tests/builders.scm b/tests/builders.scm

index 0b5577c7a3..619caa5f31 100644

;;; GNU Guix --- Functional package management for GNU

;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>

;;;

;;; This file is part of GNU Guix.

(define-module (tests builders)

#:use-module (guix download)

#:use-module (guix build-system)

#:use-module (guix build-system gnu)

#:use-module (guix build gnu-build-system)

#:use-module (guix base32)

#:use-module (guix derivations)

#:use-module (gcrypt hash)

#:use-module (guix tests)

#:use-module (guix packages)

#:use-module (gnu packages bootstrap)

#:use-module (ice-9 match)

#:use-module (ice-9 textual-ports)

#:use-module (srfi srfi-1)

(and (file-exists? out)

(valid-path? %store out))))

(test-assert "gnu-build-system"

(build-system? gnu-build-system))

--

2.41.0

index 92dede8014..d817f620cf 100644

AC_SUBST([BZIP2])

AC_SUBST([XZ])

LIBGCRYPT_LIBDIR="no"

LIBGCRYPT_PREFIX="no"

diff --git a/doc/guix.texi b/doc/guix.texi

index 339dcb2a41..a2520ce89d 100644

@item

@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0

or later;

@item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}

4.3.0 or later;

@item @url{https://www.gnu.org/software/make/, GNU Make}.

diff --git a/guix/config.scm.in b/guix/config.scm.in

index d582d91d74..62e15dd713 100644

;;; GNU Guix --- Functional package management for GNU

;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>

;;;

;;; This file is part of GNU Guix.

%config-directory

%system

%gzip

%bzip2

%xz))

(define %system

"@guix_system@")

(define %gzip

"@GZIP@")

diff --git a/guix/self.scm b/guix/self.scm

index 81a36e007f..41c5f40786 100644

("gzip" . ,(ref 'compression 'gzip))

("bzip2" . ,(ref 'compression 'bzip2))

("xz" . ,(ref 'compression 'xz))

("po4a" . ,(ref 'gettext 'po4a))

("gettext-minimal" . ,(ref 'gettext 'gettext-minimal))

("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain))

(define guile-lzma

(specification->package "guile-lzma"))

(define dependencies

(append-map transitive-package-dependencies

(list guile-gcrypt guile-gnutls guile-git guile-avahi

=> ,(make-config.scm #:gzip gzip

#:bzip2 bzip2

#:xz xz

#:package-name

%guix-package-name

#:package-version

(%storedir . "/gnu/store")

(%sysconfdir . "/etc")))

(package-name "GNU Guix")

(package-version "0")

(channel-metadata #f)

%state-directory

%store-database-directory

%config-directory

%gzip

%bzip2

%xz))

;; information is used by (guix describe).

'#$channel-metadata)

(define %gzip

#+(and gzip (file-append gzip "/bin/gzip")))

(define %bzip2

--

2.41.0

index 62312e240c..6c4276deb4 100644

#:use-module (ice-9 match))

(define (gpg+git-available?)

(which (gpg-command)) (which (gpgconf-command))))

(define commit-id-string

"abc1234")))

instances)))))))

(test-equal "latest-channel-instances #:validate-pull"

'descendant

(depends? drv3

(list drv2 drv0) (list))))))))

(test-equal "channel-news, no news"

'()

(with-temporary-git-repository directory

(latest (reference-name->oid repository "HEAD")))

(channel-news-for-commit channel (oid->string latest))))))

(test-assert "channel-news, one entry"

(with-temporary-git-repository directory

`((add ".guix-channel"

(channel-news-for-commit channel commit5 commit1))

'(#f "tag-for-first-news-entry")))))))

(test-assert "channel-news, annotated tag"

(with-temporary-git-repository directory

`((add ".guix-channel"

(channel-news-for-commit channel commit2))

(list commit1)))))))

(test-assert "latest-channel-instances, missing introduction for 'guix'"

(with-temporary-git-repository directory

'((add "a.txt" "A")

diff --git a/tests/derivations.scm b/tests/derivations.scm

index e1312bd46b..0e87778981 100644

#:use-module (guix tests git)

#:use-module (guix tests http)

#:use-module ((guix packages) #:select (package-derivation base32))

#:use-module ((guix hash) #:select (file-hash*))

#:use-module ((git oid) #:select (oid->string))

#:use-module ((git reference) #:select (reference-name->oid))

get-string-all)

text))))))

(test-equal "'git-download' built-in builder"

`(("/a.txt" . "AAA")

("/b.scm" . "#t"))

(build-derivations %store (list drv))

(directory-contents (derivation->output-path drv) get-string-all)))))

(test-assert "'git-download' built-in builder, invalid hash"

(with-temporary-git-repository directory

`((add "a.txt" "AAA")

(build-derivations %store (list drv))

#f))))

(test-assert "'git-download' built-in builder, invalid commit"

(with-temporary-git-repository directory

`((add "a.txt" "AAA")

diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm

index c063920c12..4de223d422 100644



(test-begin "git-authenticate")

(test-assert "unsigned commits"

(with-temporary-git-repository directory

'((add "a.txt" "A")

diff --git a/tests/git.scm b/tests/git.scm

index 9c944d65b1..ad43435b67 100644

#:use-module (git)

#:use-module (guix git)

#:use-module (guix tests git)

#:use-module ((guix utils) #:select (call-with-temporary-directory))

#:use-module (srfi srfi-1)

#:use-module (srfi srfi-64)

(test-begin "git")

(test-assert "commit-difference, linear history"

(with-temporary-git-repository directory

'((add "a.txt" "A")

;; empty list.

(null? (commit-difference commit1 commit4)))))))

(test-assert "commit-difference, fork"

(with-temporary-git-repository directory

'((add "a.txt" "A")

(lset= eq? (commit-difference master4 master2)

(list master4 merge master3 devel1 devel2)))))))

(test-assert "commit-difference, excluded commits"

(with-temporary-git-repository directory

'((add "a.txt" "A")

(list commit4))

(null? (commit-difference commit4 commit1 (list commit5))))))))

(test-equal "commit-relation"

'(self ;master3 master3

ancestor ;master1 master3

(commit-relation master1 merge)

(commit-relation merge master1))))))

(test-equal "commit-descendant?"

'((master3 master3 => #t)

(master1 master3 => #f)

(master1 merge)

(merge master1)))))))

(test-equal "remote-refs"

'("refs/heads/develop" "refs/heads/master"

"refs/tags/v1.0" "refs/tags/v1.1")

(tag "v1.1" "release-1.1"))

(remote-refs directory)))

(test-equal "remote-refs: only tags"

'("refs/tags/v1.0" "refs/tags/v1.1")

(with-temporary-git-repository directory

(tag "v1.1" "Release 1.1"))

(remote-refs directory #:tags? #t)))

(test-assert "update-cached-checkout, tag"

(call-with-temporary-directory

(lambda (cache)

diff --git a/tests/import-git.scm b/tests/import-git.scm

index f1bce154bb..20255dedb3 100644

#:use-module (guix import git)

#:use-module (guix git-download)

#:use-module (guix tests git)

#:use-module (srfi srfi-1)

#:use-module (srfi srfi-64))

(base32

"0000000000000000000000000000000000000000000000000000"))))))

(test-equal "latest-git-tag-version: no custom prefix, suffix, and delimiter"

"1.0.1"

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix, no suffix and delimiter"

"1.0.1"

(with-temporary-git-repository directory

'((release-tag-prefix . "prefix-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom suffix, no prefix and delimiter"

"1.0.1"

(with-temporary-git-repository directory

'((release-tag-suffix . "-suffix-[0-9]*")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom delimiter, no prefix and suffix"

"2021.09.07"

(with-temporary-git-repository directory

'((release-tag-version-delimiter . "-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: empty delimiter, no prefix and suffix"

"20210907"

(with-temporary-git-repository directory

'((release-tag-version-delimiter . "")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix and suffix, no delimiter"

"2.0.0"

(with-temporary-git-repository directory

(release-tag-suffix . "suffix-[0-9]")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix, suffix, and delimiter"

"2.0.0"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "_")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: only pre-releases available"

#f

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases"

"2.0.0-rc1"

(with-temporary-git-repository directory

'((accept-pre-releases? . #t)))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom prefix"

"2.0.0-rc1"

(with-temporary-git-repository directory

(release-tag-prefix . "version-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix"

"2.0.0-rc1"

(with-temporary-git-repository directory

(release-tag-suffix . "-suffix")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, delimiter conflicts with pre-release part"

"2.0.0_alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "_")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix and prefix"

"2.0.0-alpha"

(with-temporary-git-repository directory

(release-tag-suffix . "-suffix")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix, prefix, and delimiter"

"2.0.0-alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, no delimiter, and custom suffix, prefix"

"2alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: no tags found"

#f

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: no valid tags found"

#f

(with-temporary-git-repository directory

--

2.41.0

index deda10fee8..0ff263c81b 100644

;;; GNU Guix --- Functional package management for GNU

;;;

;;; This file is part of GNU Guix.

;;;

(define-module (guix build git)

#:use-module (guix build utils)

#:use-module (srfi srfi-34)

#:use-module (ice-9 format)

;;; Commentary:

;;;

(delete-file-recursively ".git")

#t)))

;;; git.scm ends here

diff --git a/guix/git-download.scm b/guix/git-download.scm

index d88f4c40ee..8989b1b463 100644

(define modules

(delete '(guix config)

(source-module-closure '((guix build git)

(define build

(with-imported-modules modules

guile-lzlib)

#~(begin

(use-modules (guix build git)

(ice-9 match))

(define recursive?

(setvbuf (current-output-port) 'line)

(setvbuf (current-error-port) 'line)

(mlet %store-monad ((guile (package->derivation guile system)))

(gexp->derivation (or name "git-checkout") build

--

2.41.0

index 8989b1b463..f1f19397c6 100644

#:use-module (guix packages)

#:use-module (guix modules)

#:autoload (guix build-system gnu) (standard-packages)

#:autoload (git bindings) (libgit2-init!)

#:autoload (git repository) (repository-open

repository-close!

;; downloads.

#:script-name "git-download"

#:env-vars

("git commit" . ,(git-reference-commit ref))

("git recursive?" . ,(object->string

(git-reference-recursive? ref))))

--

2.41.0

index 6889bcef79..3b29a3c81d 100644

(module-use! module (resolve-interface '(guix base32)))

module))

#:key print-build-trace?)

"Perform the download described by DRV, a fixed-output derivation, to

OUTPUT.

(derivation-let drv ((url "url")

(executable "executable")

(mirrors "mirrors")

(content-addressed-mirrors "content-addressed-mirrors")

(unless url

(leave (G_ "~a: missing URL~%") (derivation-file-name drv)))

(drv-output (assoc-ref (derivation-outputs drv) "out"))

(algo (derivation-output-hash-algo drv-output))

(hash (derivation-output-hash drv-output)))

(match args

(((? derivation-path? drv) (? store-path? output))

(assert-low-privileges)

(("--version")

(show-version-and-exit))

(x

--

2.41.0

index bb1e51aa30..045dd84ad6 100644

#:use-module ((guix store) #:select (derivation-path? store-path?))

#:autoload (guix build download) (url-fetch)

#:autoload (guix build git) (git-fetch-with-fallback)

#:use-module (ice-9 match)

#:export (guix-perform-download))

(algo (derivation-output-hash-algo drv-output))

(hash (derivation-output-hash drv-output)))

(git-fetch-with-fallback url commit output

(define (assert-low-privileges)

(when (zero? (getuid))

--

2.41.0

index 3b29a3c81d..bb1e51aa30 100644

;;; GNU Guix --- Functional package management for GNU

;;;

;;; This file is part of GNU Guix.

;;;

#:use-module (guix scripts)

#:use-module (guix derivations)

#:use-module ((guix store) #:select (derivation-path? store-path?))

#:use-module (ice-9 match)

#:export (guix-perform-download))

(drv-output (assoc-ref (derivation-outputs drv) "out"))

(algo (derivation-output-hash-algo drv-output))

(hash (derivation-output-hash drv-output)))

;; We're invoked by the daemon, which gives us write access to OUTPUT.

(when (url-fetch url output

#:print-build-trace? print-build-trace?

(when (and executable (string=? executable "1"))

(chmod output #o755))))))

(define (assert-low-privileges)

(when (zero? (getuid))

(leave (G_ "refusing to run with elevated privileges (UID ~a)~%")

(match args

(((? derivation-path? drv) (? store-path? output))

(assert-low-privileges)

(("--version")

(show-version-and-exit))

(x

diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc

index 4111ac4760..6bf467354a 100644

/* GNU Guix --- Functional package management for GNU

This file is part of GNU Guix.

static const std::map<std::string, derivationBuilder> builtins =

{

};

derivationBuilder lookupBuiltinBuilder(const std::string & name)

diff --git a/tests/derivations.scm b/tests/derivations.scm

index 66c777cfe7..e1312bd46b 100644

#:use-module (guix utils)

#:use-module ((gcrypt hash) #:prefix gcrypt:)

#:use-module (guix base32)

#:use-module (guix tests)

#:use-module (guix tests http)

#:use-module ((guix packages) #:select (package-derivation base32))

#:use-module (gnu packages bootstrap)

#:use-module ((gnu packages guile) #:select (guile-1.8))

#:use-module (srfi srfi-1)

(stat:ino (lstat file2))))))))

(test-equal "built-in-builders"

(built-in-builders %store))

(test-assert "unknown built-in builder"

get-string-all)

text))))))

(test-equal "derivation-name"

"foo-0.0"

(let ((drv (derivation %store "foo-0.0" %bash '())))

--

2.41.0

index f1f19397c6..505dff0a89 100644

#:use-module (guix records)

#:use-module (guix packages)

#:use-module (guix modules)

#:autoload (guix build-system gnu) (standard-packages)

#:autoload (guix download) (%download-fallback-test)

#:autoload (git bindings) (libgit2-init!)

(let ((distro (resolve-interface '(gnu packages version-control))))

(module-ref distro 'git-minimal)))

(define inputs

;; When doing 'git clone --recursive', we need sed, grep, etc. to be

;; available so that 'git submodule' works.

#:recursive? recursive?

#:git-command "git")))))

(gexp->derivation (or name "git-checkout") build

;; Use environment variables and a fixed script name so

#:recursive? #t

#:guile-for-build guile)))

(define (git-version version revision commit)

"Return the version string for packages using git-download."

;; git-version is almost exclusively executed while modules are being loaded.

diff --git a/tests/builders.scm b/tests/builders.scm

index 0b5577c7a3..619caa5f31 100644

;;; GNU Guix --- Functional package management for GNU

;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>

;;;

;;; This file is part of GNU Guix.

(define-module (tests builders)

#:use-module (guix download)

#:use-module (guix build-system)

#:use-module (guix build-system gnu)

#:use-module (guix build gnu-build-system)

#:use-module (guix base32)

#:use-module (guix derivations)

#:use-module (gcrypt hash)

#:use-module (guix tests)

#:use-module (guix packages)

#:use-module (gnu packages bootstrap)

#:use-module (ice-9 match)

#:use-module (ice-9 textual-ports)

#:use-module (srfi srfi-1)

(and (file-exists? out)

(valid-path? %store out))))

(test-assert "gnu-build-system"

(build-system? gnu-build-system))

--

2.41.0

index 92dede8014..d817f620cf 100644

AC_SUBST([BZIP2])

AC_SUBST([XZ])

LIBGCRYPT_LIBDIR="no"

LIBGCRYPT_PREFIX="no"

diff --git a/doc/guix.texi b/doc/guix.texi

index 50c4984d71..8812e42e99 100644

@item

@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0

or later;

@item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}

4.3.0 or later;

@item @url{https://www.gnu.org/software/make/, GNU Make}.

diff --git a/guix/config.scm.in b/guix/config.scm.in

index d582d91d74..62e15dd713 100644

;;; GNU Guix --- Functional package management for GNU

;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>

;;;

;;; This file is part of GNU Guix.

%config-directory

%system

%gzip

%bzip2

%xz))

(define %system

"@guix_system@")

(define %gzip

"@GZIP@")

diff --git a/guix/self.scm b/guix/self.scm

index d2300052d8..9eaddc7a29 100644

("gzip" . ,(ref 'compression 'gzip))

("bzip2" . ,(ref 'compression 'bzip2))

("xz" . ,(ref 'compression 'xz))

("po4a" . ,(ref 'gettext 'po4a))

("gettext-minimal" . ,(ref 'gettext 'gettext-minimal))

("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain))

(define guile-lzma

(specification->package "guile-lzma"))

(define dependencies

(append-map transitive-package-dependencies

(list guile-gcrypt guile-gnutls guile-git guile-avahi

=> ,(make-config.scm #:gzip gzip

#:bzip2 bzip2

#:xz xz

#:package-name

%guix-package-name

#:package-version

(%storedir . "/gnu/store")

(%sysconfdir . "/etc")))

(package-name "GNU Guix")

(package-version "0")

(channel-metadata #f)

%state-directory

%store-database-directory

%config-directory

%gzip

%bzip2

%xz))

;; information is used by (guix describe).

'#$channel-metadata)

(define %gzip

#+(and gzip (file-append gzip "/bin/gzip")))

(define %bzip2

--

2.41.0

index 62312e240c..6c4276deb4 100644

#:use-module (ice-9 match))

(define (gpg+git-available?)

(which (gpg-command)) (which (gpgconf-command))))

(define commit-id-string

"abc1234")))

instances)))))))

(test-equal "latest-channel-instances #:validate-pull"

'descendant

(depends? drv3

(list drv2 drv0) (list))))))))

(test-equal "channel-news, no news"

'()

(with-temporary-git-repository directory

(latest (reference-name->oid repository "HEAD")))

(channel-news-for-commit channel (oid->string latest))))))

(test-assert "channel-news, one entry"

(with-temporary-git-repository directory

`((add ".guix-channel"

(channel-news-for-commit channel commit5 commit1))

'(#f "tag-for-first-news-entry")))))))

(test-assert "channel-news, annotated tag"

(with-temporary-git-repository directory

`((add ".guix-channel"

(channel-news-for-commit channel commit2))

(list commit1)))))))

(test-assert "latest-channel-instances, missing introduction for 'guix'"

(with-temporary-git-repository directory

'((add "a.txt" "A")

diff --git a/tests/derivations.scm b/tests/derivations.scm

index e1312bd46b..0e87778981 100644

#:use-module (guix tests git)

#:use-module (guix tests http)

#:use-module ((guix packages) #:select (package-derivation base32))

#:use-module ((guix hash) #:select (file-hash*))

#:use-module ((git oid) #:select (oid->string))

#:use-module ((git reference) #:select (reference-name->oid))

get-string-all)

text))))))

(test-equal "'git-download' built-in builder"

`(("/a.txt" . "AAA")

("/b.scm" . "#t"))

(build-derivations %store (list drv))

(directory-contents (derivation->output-path drv) get-string-all)))))

(test-assert "'git-download' built-in builder, invalid hash"

(with-temporary-git-repository directory

`((add "a.txt" "AAA")

(build-derivations %store (list drv))

#f))))

(test-assert "'git-download' built-in builder, invalid commit"

(with-temporary-git-repository directory

`((add "a.txt" "AAA")

diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm

index c063920c12..4de223d422 100644



(test-begin "git-authenticate")

(test-assert "unsigned commits"

(with-temporary-git-repository directory

'((add "a.txt" "A")

diff --git a/tests/git.scm b/tests/git.scm

index 9c944d65b1..ad43435b67 100644

#:use-module (git)

#:use-module (guix git)

#:use-module (guix tests git)

#:use-module ((guix utils) #:select (call-with-temporary-directory))

#:use-module (srfi srfi-1)

#:use-module (srfi srfi-64)

(test-begin "git")

(test-assert "commit-difference, linear history"

(with-temporary-git-repository directory

'((add "a.txt" "A")

;; empty list.

(null? (commit-difference commit1 commit4)))))))

(test-assert "commit-difference, fork"

(with-temporary-git-repository directory

'((add "a.txt" "A")

(lset= eq? (commit-difference master4 master2)

(list master4 merge master3 devel1 devel2)))))))

(test-assert "commit-difference, excluded commits"

(with-temporary-git-repository directory

'((add "a.txt" "A")

(list commit4))

(null? (commit-difference commit4 commit1 (list commit5))))))))

(test-equal "commit-relation"

'(self ;master3 master3

ancestor ;master1 master3

(commit-relation master1 merge)

(commit-relation merge master1))))))

(test-equal "commit-descendant?"

'((master3 master3 => #t)

(master1 master3 => #f)

(master1 merge)

(merge master1)))))))

(test-equal "remote-refs"

'("refs/heads/develop" "refs/heads/master"

"refs/tags/v1.0" "refs/tags/v1.1")

(tag "v1.1" "release-1.1"))

(remote-refs directory)))

(test-equal "remote-refs: only tags"

'("refs/tags/v1.0" "refs/tags/v1.1")

(with-temporary-git-repository directory

(tag "v1.1" "Release 1.1"))

(remote-refs directory #:tags? #t)))

(test-assert "update-cached-checkout, tag"

(call-with-temporary-directory

(lambda (cache)

diff --git a/tests/import-git.scm b/tests/import-git.scm

index f1bce154bb..20255dedb3 100644

#:use-module (guix import git)

#:use-module (guix git-download)

#:use-module (guix tests git)

#:use-module (srfi srfi-1)

#:use-module (srfi srfi-64))

(base32

"0000000000000000000000000000000000000000000000000000"))))))

(test-equal "latest-git-tag-version: no custom prefix, suffix, and delimiter"

"1.0.1"

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix, no suffix and delimiter"

"1.0.1"

(with-temporary-git-repository directory

'((release-tag-prefix . "prefix-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom suffix, no prefix and delimiter"

"1.0.1"

(with-temporary-git-repository directory

'((release-tag-suffix . "-suffix-[0-9]*")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom delimiter, no prefix and suffix"

"2021.09.07"

(with-temporary-git-repository directory

'((release-tag-version-delimiter . "-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: empty delimiter, no prefix and suffix"

"20210907"

(with-temporary-git-repository directory

'((release-tag-version-delimiter . "")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix and suffix, no delimiter"

"2.0.0"

(with-temporary-git-repository directory

(release-tag-suffix . "suffix-[0-9]")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: custom prefix, suffix, and delimiter"

"2.0.0"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "_")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: only pre-releases available"

#f

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases"

"2.0.0-rc1"

(with-temporary-git-repository directory

'((accept-pre-releases? . #t)))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom prefix"

"2.0.0-rc1"

(with-temporary-git-repository directory

(release-tag-prefix . "version-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix"

"2.0.0-rc1"

(with-temporary-git-repository directory

(release-tag-suffix . "-suffix")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, delimiter conflicts with pre-release part"

"2.0.0_alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "_")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix and prefix"

"2.0.0-alpha"

(with-temporary-git-repository directory

(release-tag-suffix . "-suffix")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, and custom suffix, prefix, and delimiter"

"2.0.0-alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "-")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: accept pre-releases, no delimiter, and custom suffix, prefix"

"2alpha"

(with-temporary-git-repository directory

(release-tag-version-delimiter . "")))))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: no tags found"

#f

(with-temporary-git-repository directory

(let ((package (make-package directory "1.0.0")))

(latest-git-tag-version package))))

(test-equal "latest-git-tag-version: no valid tags found"

#f

(with-temporary-git-repository directory

--

2.41.0