From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Dec 2021 17:18:24 +0100 Subject: gnu: Simplify package inputs. This commit was obtained by running: ./pre-inst-env guix style without any additional argument. --- gnu/packages/ci.scm | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'gnu/packages/ci.scm') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 652722c74a..2fa7260b7f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -168,28 +168,24 @@ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs - `(("guile" ,guile-3.0-latest) - ("guile-avahi" ,guile-avahi) - ("guile-fibers" ,guile-fibers) - ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-4) - ("guile-simple-zmq" ,guile-simple-zmq) - ("guile-squee" ,guile-squee-dev) - ("guile-git" ,guile-git) - ("guile-zlib" ,guile-zlib) - ("guile-mastodon" ,guile-mastodon) - ("gnutls" ,gnutls) - ("mailutils" ,mailutils) - ;; FIXME: this is propagated by "guile-git", but it needs to be among - ;; the inputs to add it to GUILE_LOAD_PATH. - ("guile-bytestructures" ,guile-bytestructures) - ("guix" ,guix))) + (list guile-3.0-latest + guile-avahi + guile-fibers + guile-gcrypt + guile-json-4 + guile-simple-zmq + guile-squee-dev + guile-git + guile-zlib + guile-mastodon + gnutls + mailutils + ;; FIXME: this is propagated by "guile-git", but it needs to be among + ;; the inputs to add it to GUILE_LOAD_PATH. + guile-bytestructures + guix)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("ephemeralpg" ,ephemeralpg))) + (list autoconf automake pkg-config texinfo ephemeralpg)) (native-search-paths ;; For HTTPS access, Cuirass itself honors these variables, with the ;; same semantics as Git and OpenSSL (respectively). @@ -275,11 +271,7 @@ intended as a replacement for Hydra.") #t))))) (inputs - `(("capnproto" ,capnproto) - ("rapidjson" ,rapidjson) - ("sqlite" ,sqlite) - ("boost" ,boost) - ("zlib" ,zlib))) + (list capnproto rapidjson sqlite boost zlib)) (native-inputs `(("googletest" ,googletest) ("uglifyjs" ,node-uglify-js) -- cgit v1.2.3