From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eH2jB0V7pmB37gAAgWs5BA (envelope-from ) for ; Thu, 20 May 2021 17:07:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id ePNUA0V7pmB1aQAAbx9fmQ (envelope-from ) for ; Thu, 20 May 2021 15:07:49 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 802291D455 for ; Thu, 20 May 2021 17:07:48 +0200 (CEST) Received: from localhost ([::1]:35036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljkH5-0006Rs-IJ for larch@yhetil.org; Thu, 20 May 2021 11:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljk90-0008Hc-8b for guix-devel@gnu.org; Thu, 20 May 2021 10:59:26 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35234) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljk8z-0001mH-Vt; Thu, 20 May 2021 10:59:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljk8y-0005bZ-6P; Thu, 20 May 2021 10:59:24 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-devel@gnu.org Subject: [PATCH RFC 3/4] DRAFT gnu: Change inputs of core packages to plain lists. Date: Thu, 20 May 2021 16:58:29 +0200 Message-Id: <20210520145830.14108-4-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520145830.14108-1-ludo@gnu.org> References: <20210520145830.14108-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621523268; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XJDyf4lqHH6mW/MGBWOI0nRl1eEsWEqoOsq01+iAkGo=; b=KP77Dtulc3KfszmW4/uCJKA0srvwYo89aFEDe3CSLxAYkPdJFJaXwGjjjp6M82paauPDjU avY62JlF2vl5FpICrUoiDipG4dMKQ8lLL+/Dog4TA53tWJNVGiCQxW+sBOc7G5aaYwcBL+ gTrnT77+7OKFUnD1hyJextqA9ZK1VNtxOBdOw9Itdtl16cbl2sLi3JzW27BgPWR3h7p2Gw NdZi2eE2kmYHj12CNsJh+l0vEOhDUFBz5go7p1IZM3sl1yRzRHwWC73kdcDw+/CLevIUgi PFoAD2d/dgkhjKia+P+v77omvoUU0eCe482/LTyk0Q608WrwVBdMUcUtw4f+GA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621523268; a=rsa-sha256; cv=none; b=nuTUcd4t2JU1HSc1zO1S/fjEWBL2NuYmPJz0rKcDjeJHQWqcmglgWcYhpcsHQ0RYET89IY S30pilIzlmREfWuqL0pCUwC0nYAf2sBSIXREEs4ecVTRPYHxr4FFwJLSiP7ksJdv6iLZlb M0pItt24e0cXhwWPDOJ5GfxGHXA/amu062sgqEqksPIgKaX2cZtNJpCD5EOLiAKEGDk4d+ X0+F45MDcOeC43D9pREsPxGsd7PVnWKT3zC9HghFaAdhNrln1reWYtCSjx2b+Ljf+dKps0 MLgMRgl/l/TJX89pB8kCuhRjRz5kpOo7luFDzPb3FLz91iSB+tgQBcfusOl+7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Spam-Score: 2.06 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 802291D455 X-Spam-Score: 2.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: eFG7KhVCj26V This is transparent: the resulting derivations are unchanged. * gnu/packages/base.scm (grep, sed, tar, patch, diffutils) (coreutils, gnu-make, make-glibc-utf8-locales): Change input fields to plain package lists. * gnu/packages/guile.scm (guile-1.8, guile-json-1, guile-json-3) (guile-gdbm-ffi, guile-sqlite3, guile-bytestructures) (guile-git, guile-zlib, guile-lzlib, guile-zstd): Likewise. * gnu/packages/mes.scm (nyacc-0.86, nyacc-0.99) (nyacc, nyacc-1.00.2, mes-0.19, mes): Likewise. --- gnu/packages/base.scm | 30 +++++++-------- gnu/packages/guile.scm | 87 ++++++++++-------------------------------- gnu/packages/mes.scm | 23 ++++------- 3 files changed, 42 insertions(+), 98 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 33c4952415..6656742c06 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -109,8 +109,8 @@ command-line arguments, multiple languages, and so on.") "0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6")) (patches (search-patches "grep-timing-sensitive-test.patch")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl))) ;some of the tests require it - (inputs `(("pcre" ,pcre))) + (native-inputs (list perl)) ;some of the tests require it + (inputs (list pcre)) (arguments `(#:phases (modify-phases %standard-phases @@ -161,8 +161,7 @@ including, for example, recursive directory searching.") (modules '((guix build utils))))) (build-system gnu-build-system) (synopsis "Stream editor") - (native-inputs - `(("perl" ,perl))) ;for tests + (native-inputs (list perl)) ;for tests (description "Sed is a non-interactive, text stream editor. It receives a text input from a file or from standard input and it then applies a series of text @@ -215,7 +214,7 @@ implementation offers several extensions over the standard utility.") ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able ;; to refer to the target Bash. (inputs (if (%current-target-system) - `(("bash" ,bash)) + (list bash) '())) (synopsis "Managing tar archives") @@ -248,7 +247,7 @@ standard utility.") (if (%current-target-system) `(#:configure-flags '("gl_cv_func_working_mktime=yes")) '())) - (native-inputs `(("ed" ,ed))) + (native-inputs (list ed)) (synopsis "Apply differences to originals, with optional backups") (description "Patch is a program that applies changes to files based on differences @@ -271,7 +270,7 @@ differences.") (base32 "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl))) + (native-inputs (list perl)) (synopsis "Comparing and merging files") (description "GNU Diffutils is a package containing tools for finding the @@ -330,16 +329,16 @@ used to apply commands with arbitrarily long arguments.") "1yjcrh5hw70c0yn8zw55pd6j51dj90anpq8mmg649ps9g3gdhn24")) (patches (search-patches "coreutils-ls.patch")))) (build-system gnu-build-system) - (inputs `(("acl" ,acl) ; TODO: add SELinux - ("attr" ,attr) ;for xattrs in ls, mv, etc - ("gmp" ,gmp) ;bignums in 'expr', yay! + (inputs `(,acl ;TODO: add SELinux + ,attr ;for xattrs in ls, mv, etc + ,gmp ;bignums in 'expr', yay! ;; Do not use libcap when cross-compiling since it's not quite ;; cross-compilable; and use it only for supported systems. ,@(if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems libcap))) - `(("libcap" ,libcap)) ;capability support in 'ls', etc. + `(,libcap) ;capability support in 'ls', etc. '()))) (native-inputs ;; Perl is needed to run tests in native builds, and to run the bundled @@ -348,7 +347,7 @@ used to apply commands with arbitrarily long arguments.") ;; for help2man. (if (%current-target-system) '() - `(("perl" ,perl)))) + (list perl))) (outputs '("out" "debug")) (arguments `(#:parallel-build? #f ; help2man may be called too early @@ -443,8 +442,8 @@ standard.") "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0")) (patches (search-patches "make-impure-dirs.patch")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile - (inputs `(("guile" ,guile-3.0))) + (native-inputs (list pkg-config)) ;to detect Guile + (inputs (list guile-3.0)) (outputs '("out" "debug")) (arguments `(,@(if (hurd-target?) @@ -1147,8 +1146,7 @@ to the @code{share/locale} sub-directory of this package.") locale ".UTF-8"))) ',locales) #t)))) - (native-inputs `(("glibc" ,glibc) - ("gzip" ,gzip))) + (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales") (P_ "Customized sample of UTF-8 locales"))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a3876a2591..fb566fe690 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -112,13 +112,11 @@ `(("self" ,this-package)) '())) - (inputs `(("gawk" ,gawk) - ("readline" ,readline))) + (inputs (list gawk readline)) ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be ;; propagated. - (propagated-inputs `(("gmp" ,gmp) - ("libltdl" ,libltdl))) + (propagated-inputs (list gmp libltdl)) (native-search-paths (list (search-path-specification @@ -570,9 +568,8 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings - (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-2.2))) - (inputs `(("guile" ,guile-2.2))) + (native-inputs (list pkg-config guile-2.2)) + (inputs (list guile-2.2)) (synopsis "JSON module for Guile") (description "Guile-JSON supports parsing and building JSON documents according to the @@ -610,9 +607,8 @@ specification. These are the main features: (sha256 (base32 "0nj0684qgh6ppkbdyxqfyjwsv2qbyairxpi8fzrhsi3xnc7jn4im")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("guile" ,guile-3.0))) - (inputs `(("guile" ,guile-3.0))))) + (native-inputs (list pkg-config guile-3.0)) + (inputs (list guile-3.0)))) (define-public guile3.0-json (deprecated-package "guile3.0-json" guile-json-3)) @@ -671,10 +667,8 @@ specification. These are the main features: (format #f "(dynamic-link \"~a/lib/libgdbm.so\")" (assoc-ref inputs "gdbm")))) #t))))) - (native-inputs - `(("guile" ,guile-3.0))) - (inputs - `(("gdbm" ,gdbm))) + (native-inputs (list guile-3.0)) + (inputs (list gdbm)) (home-page "https://github.com/ijp/guile-gdbm") (synopsis "Guile bindings to the GDBM library via Guile's FFI") (description @@ -705,14 +699,8 @@ Guile's foreign function interface.") "1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("guile" ,guile-3.0) - ("pkg-config" ,pkg-config))) - (inputs - `(("guile" ,guile-3.0) - ("sqlite" ,sqlite))) + (native-inputs (list autoconf automake guile-3.0 pkg-config)) + (inputs (list guile-3.0 sqlite)) (synopsis "Access SQLite databases from Guile") (description "This package provides Guile bindings to the SQLite database system.") @@ -752,13 +740,8 @@ Guile's foreign function interface.") (doc (string-append out "/share/doc/" package))) (install-file "README.md" doc) #t)))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("guile" ,guile-3.0))) - (inputs - `(("guile" ,guile-3.0))) + (native-inputs (list autoconf automake pkg-config guile-3.0)) + (inputs (list guile-3.0)) (synopsis "Structured access to bytevector contents for Guile") (description "Guile bytestructures offers a system imitating the type system @@ -795,17 +778,11 @@ type system, elevating types to first-class status.") (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ("guile" ,guile-3.0) - ("guile-bytestructures" ,guile-bytestructures))) + (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures)) (inputs - `(("guile" ,guile-3.0) - ("libgit2" ,libgit2))) + (list guile-3.0 libgit2)) (propagated-inputs - `(("guile-bytestructures" ,guile-bytestructures))) + (list guile-bytestructures)) (synopsis "Guile bindings for libgit2") (description "This package provides Guile bindings to libgit2, a library to @@ -842,16 +819,8 @@ manipulate repositories of the Git version control system.") (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ,@(if (%current-target-system) - `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc' - '()))) - (inputs - `(("guile" ,guile-3.0) - ("zlib" ,zlib))) + (native-inputs (list autoconf automake pkg-config guile-3.0)) + (inputs (list guile-3.0 zlib)) (synopsis "Guile bindings to zlib") (description "This package provides Guile bindings for zlib, a lossless @@ -881,16 +850,8 @@ Guile's foreign function interface.") (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ,@(if (%current-target-system) - `(("guile" ,guile-3.0)) ;for 'guild compile' and 'guile-3.0.pc' - '()))) - (inputs - `(("guile" ,guile-3.0) - ("lzlib" ,lzlib))) + (native-inputs (list autoconf automake pkg-config guile-3.0)) + (inputs (list guile-3.0 lzlib)) (synopsis "Guile bindings to lzlib") (description "This package provides Guile bindings for lzlib, a C library for @@ -916,14 +877,8 @@ pure Scheme by using Guile's foreign function interface.") (base32 "1c8l7829b5yx8wdc0mrhzjfwb6h9hb7cd8dfxcr71a7vlsi86310")))) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("guile" ,guile-3.0))) - (inputs - `(("zstd" ,zstd "lib") - ("guile" ,guile-3.0))) + (native-inputs (list autoconf automake pkg-config guile-3.0)) + (inputs (list `(,zstd "lib") guile-3.0)) (synopsis "GNU Guile bindings to the zstd compression library") (description "This package provides a GNU Guile interface to the zstd (``zstandard'') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 750ec2e67a..b074b37289 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -55,8 +55,7 @@ (base32 "0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9")))) (build-system gnu-build-system) - (native-inputs - `(("guile" ,guile-2.2))) + (native-inputs (list guile-2.2)) (synopsis "LALR(1) Parser Generator in Guile") (description "NYACC is an LALR(1) parser generator implemented in Guile. @@ -91,10 +90,8 @@ extensive examples, including parsers for the Javascript and C99 languages.") (("^DOCDIR =.*") "DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n")) #t)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("guile" ,guile-2.2))))) + (native-inputs (list pkg-config)) + (inputs (list guile-2.2)))) (define-public nyacc (package @@ -115,8 +112,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") "GUILE_GLOBAL_SITE=\ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) #t)))) - (inputs - `(("guile" ,guile-3.0))))) + (inputs (list guile-3.0)))) (define-public nyacc-1.00.2 (package @@ -144,8 +140,7 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) (sha256 (base32 "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk")))) - (inputs - `(("guile" ,guile-2.2))))) + (inputs (list guile-2.2)))) (define-public mes-0.19 ;; Mes used for bootstrap. @@ -161,9 +156,7 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) - (propagated-inputs - `(("mescc-tools" ,mescc-tools-0.5.2) - ("nyacc" ,nyacc-0.86))) + (propagated-inputs (list mescc-tools-0.5.2 nyacc-0.86)) (native-inputs `(("guile" ,guile-2.2) ,@(let ((target-system (or (%current-target-system) @@ -204,9 +197,7 @@ Guile.") (base32 "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) - (propagated-inputs - `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc-1.00.2))) + (propagated-inputs (list mescc-tools nyacc-1.00.2)) (native-search-paths (list (search-path-specification (variable "C_INCLUDE_PATH") -- 2.31.1