[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: guix build: '--with-commit' makes recursive checkouts.
From: |
guix-commits |
Subject: |
07/08: guix build: '--with-commit' makes recursive checkouts. |
Date: |
Sun, 17 Mar 2019 17:55:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 845c44012c2a05436dc0a5316ff3c2a9e5bd725f
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 13 10:26:31 2019 +0100
guix build: '--with-commit' makes recursive checkouts.
This was an omission from commit
024a6bfba906742c136a47b4099f06880f1d3f15.
* guix/scripts/build.scm (transform-package-source-commit): Add
'recursive?' field to SOURCE.
* tests/scripts-build.scm ("options->transformation, with-branch")
("options->transformation, with-commit"): New tests.
---
guix/scripts/build.scm | 3 ++-
tests/scripts-build.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 8ebcf79..20929d6 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -342,7 +342,8 @@ strings like \"guile-next=cabba9e\" meaning that packages
are built using
(if (< (string-length commit) 7)
commit
(string-take commit 7))))
- (source (git-checkout (url url) (commit commit)))))
+ (source (git-checkout (url url) (commit commit)
+ (recursive? #t)))))
(let* ((replacements (evaluate-git-replacement-specs replacement-specs
replace))
diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm
index 4bf1e1a..32876e9 100644
--- a/tests/scripts-build.scm
+++ b/tests/scripts-build.scm
@@ -20,6 +20,7 @@
#:use-module (guix tests)
#:use-module (guix store)
#:use-module (guix packages)
+ #:use-module (guix git-download)
#:use-module (guix scripts build)
#:use-module (guix ui)
#:use-module (guix utils)
@@ -168,6 +169,54 @@
((("x" dep))
(eq? (package-replacement dep) findutils)))))))))))
+(test-equal "options->transformation, with-branch"
+ (git-checkout (url "https://example.org")
+ (branch "devel")
+ (recursive? #t))
+ (let* ((p (dummy-package "guix.scm"
+ (inputs `(("foo" ,grep)
+ ("bar" ,(dummy-package "chbouib"
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://example.org")
+ (commit "cabba9e")))
+ (sha256 #f)))))))))
+ (t (options->transformation '((with-branch . "chbouib=devel")))))
+ (with-store store
+ (let ((new (t store p)))
+ (and (not (eq? new p))
+ (match (package-inputs new)
+ ((("foo" dep1) ("bar" dep2))
+ (and (string=? (package-full-name dep1)
+ (package-full-name grep))
+ (string=? (package-name dep2) "chbouib")
+ (package-source dep2)))))))))
+
+(test-equal "options->transformation, with-commit"
+ (git-checkout (url "https://example.org")
+ (commit "abcdef")
+ (recursive? #t))
+ (let* ((p (dummy-package "guix.scm"
+ (inputs `(("foo" ,grep)
+ ("bar" ,(dummy-package "chbouib"
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://example.org")
+ (commit "cabba9e")))
+ (sha256 #f)))))))))
+ (t (options->transformation '((with-commit . "chbouib=abcdef")))))
+ (with-store store
+ (let ((new (t store p)))
+ (and (not (eq? new p))
+ (match (package-inputs new)
+ ((("foo" dep1) ("bar" dep2))
+ (and (string=? (package-full-name dep1)
+ (package-full-name grep))
+ (string=? (package-name dep2) "chbouib")
+ (package-source dep2)))))))))
+
(test-equal "options->transformation, with-git-url"
(let ((source (git-checkout (url "https://example.org")
(recursive? #t))))
- branch master updated (19c0cdb -> d831b19), guix-commits, 2019/03/17
- 06/08: guix build: Transformation options match packages by spec., guix-commits, 2019/03/17
- 04/08: packages: Add 'package-input-rewriting/spec'., guix-commits, 2019/03/17
- 08/08: guix build: '--with-branch' strips slashes from the version string., guix-commits, 2019/03/17
- 07/08: guix build: '--with-commit' makes recursive checkouts.,
guix-commits <=
- 03/08: guix build: Add '--with-git-url'., guix-commits, 2019/03/17
- 05/08: guix build: Factorize 'package-git-url'., guix-commits, 2019/03/17
- 02/08: scripts: 'warn-about-old-distro' looks at the age of the running Guix., guix-commits, 2019/03/17
- 01/08: describe: Add 'current-profile-date'., guix-commits, 2019/03/17