diff options
author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /guix/ci.scm | |
parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'guix/ci.scm')
-rw-r--r-- | guix/ci.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/ci.scm b/guix/ci.scm index f04109112c..c70e5bb9e6 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -43,7 +43,7 @@ checkout? checkout-commit - checkout-input + checkout-channel evaluation? evaluation-id @@ -94,7 +94,7 @@ (define-json-mapping <checkout> make-checkout checkout? json->checkout (commit checkout-commit) ;string (SHA1) - (input checkout-input)) ;string (name) + (channel checkout-channel)) ;string (name) (define-json-mapping <evaluation> make-evaluation evaluation? json->evaluation |