diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-01-27 22:23:19 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-02-04 09:23:39 +0100 |
commit | 55daad123e896c0e83361496cf49625289ee3571 (patch) | |
tree | 44eedcc466b3ba3a3af9a25ef1a13c19ebca2a3b /guix | |
parent | 316fc2acbb112bfa572ae30f95a93bcd56621234 (diff) |
build: Add '--with-channel-commit' and related configure flags.
Partially fixes <https://bugs.gnu.org/45896>.
* m4/guix.m4 (GUIX_CHANNEL_METADATA): New macro.
* configure.ac: Use it.
* guix/config.scm.in (%channel-metadata): Adjust accordingly.
Diffstat (limited to 'guix')
-rw-r--r-- | guix/config.scm.in | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 223c9eb418..d582d91d74 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -61,9 +61,23 @@ (define %channel-metadata ;; When true, this is an sexp containing metadata for the 'guix' channel ;; this file was built from. This is used by (guix describe). - - ;; TODO: Implement 'configure.ac' machinery to initialize it. - #f) + (let ((url @GUIX_CHANNEL_URL@) + (commit @GUIX_CHANNEL_COMMIT@) + (intro @GUIX_CHANNEL_INTRODUCTION@)) + (and url commit + `(repository + (version 0) + (url ,url) + (branch "master") ;XXX: doesn't really matter + (commit ,commit) + (name guix) + ,@(if intro + `((introduction + (channel-introduction + (version 0) + (commit ,(car intro)) + (signer ,(cdr intro))))) + '()))))) (define %storedir "@storedir@") |