From patchwork Sat Feb 25 19:00:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 47333 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9510F16B42; Sat, 25 Feb 2023 19:01:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 064F616AF4 for ; Sat, 25 Feb 2023 19:01:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVznO-0003tt-TL; Sat, 25 Feb 2023 14:01:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVzn4-0003IZ-G6 for guix-patches@gnu.org; Sat, 25 Feb 2023 14:01:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzn4-0001MK-7J for guix-patches@gnu.org; Sat, 25 Feb 2023 14:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzn4-00085x-2m; Sat, 25 Feb 2023 14:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61790] [PATCH core-updates 1/5] gnu: guile: Remove input labels. References: <20230225185544.5152-1-ludo@gnu.org> In-Reply-To: <20230225185544.5152-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 19:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61790@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , andreas@enge.fr X-Debbugs-Original-Xcc: andreas@enge.fr Received: via spool by 61790-submit@debbugs.gnu.org id=B61790.167735164931055 (code B ref 61790); Sat, 25 Feb 2023 19:01:02 +0000 Received: (at 61790) by debbugs.gnu.org; 25 Feb 2023 19:00:49 +0000 Received: from localhost ([127.0.0.1]:41521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmq-00084f-BS for submit@debbugs.gnu.org; Sat, 25 Feb 2023 14:00:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzmo-00084F-Jq for 61790@debbugs.gnu.org; Sat, 25 Feb 2023 14:00:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVzmi-0001D3-64; Sat, 25 Feb 2023 14:00:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=zTkMcAnWGSyvhB4YSbxKX5Egx5MKSQADg6HuuuQqPlQ=; b=OPr/IhXJOyFDmk dKazUOToDC3XqhQ7QoUqU/jKEqxqm4CHXFAV5y/vrucWB0PhnhVOA6XOJjJIU6ZB8TjLz6qzFlsPZ WTHmpdl65oGbdZ6WUbdWENEPk3DyA9NuR5JI0sie0n5PlfnU+xpKkvKJcTQFW/TSZAxBxyhxx8ffV I5J4fx2oCBdMAYbK5lPfX9VGsLoonhFGYqA+uvszdBeZ0dshHLJc3uBCD0uZMAFtU8rlQ5U1GeYGh 5UQp76wzsuLxVWDQOxnTZYV2rzU4irh/c6ZA2iUEwDkWfFkRs37HnX0RGrUzL7tAb3IP1WE1WYr0O MF5QATNw6N2u9UjkCbPA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] 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 1pVzmh-0005iV-NB; Sat, 25 Feb 2023 14:00:39 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 25 Feb 2023 20:00:26 +0100 Message-Id: <20230225190030.5289-1-ludo@gnu.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (libiconv-if-needed): Remove input label. * gnu/packages/guile.scm (guile-2.0)[native-inputs, inputs] [propagated-inputs]: Remove labels. (guile-next)[native-inputs]: Change "self" to "guile". (make-guile-readline): Adjust 'inputs' and 'propagated-inputs' accordingly. --- gnu/packages/base.scm | 4 +-- gnu/packages/guile.scm | 60 ++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 558abf8492..2fcb02ffd9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022 Ludovic Courtès +;;; Copyright © 2012-2023 Ludovic Courtès ;;; Copyright © 2014, 2019 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver @@ -1546,7 +1546,7 @@ (define* (libiconv-if-needed #:optional (target (%current-target-system))) ;; POSIX C libraries provide iconv. Platforms with an incomplete libc ;; without iconv, such as MinGW, must return the then clause. (if (target-mingw? target) - `(("libiconv" ,libiconv)) + (list libiconv) '())) (define-public (canonical-package package) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 92658a2d69..c2ffbefeec 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -157,32 +157,35 @@ (define-public guile-2.0 (build-system gnu-build-system) ;; When cross-compiling, a native version of Guile itself is needed. - (native-inputs `(,@(if (%current-target-system) - `(("self" ,this-package)) - '()) - ("pkgconfig" ,pkg-config))) - (inputs `(("libffi" ,libffi) - ,@(libiconv-if-needed) + (native-inputs + (append (list pkg-config) + (if (%current-target-system) + (list this-package) + '()))) + (inputs + (append (list libffi) + (libiconv-if-needed) - ;; We need Bash when cross-compiling because some of the scripts - ;; in bin/ refer to it. Use 'bash-minimal' because we don't need - ;; an interactive Bash with Readline and all. - ,@(if (target-mingw?) '() `(("bash" ,bash-minimal))))) + ;; We need Bash when cross-compiling because some of the scripts + ;; in bin/ refer to it. Use 'bash-minimal' because we don't need + ;; an interactive Bash with Readline and all. + (if (target-mingw?) '() (list bash-minimal)))) (propagated-inputs - `( ;; These ones aren't normally needed here, but since `libguile-2.0.la' - ;; reads `-lltdl -lunistring', adding them here will add the needed - ;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see - ;; . - ("libunistring" ,libunistring) + (list + ;; These ones aren't normally needed here, but since `libguile-2.0.la' + ;; reads `-lltdl -lunistring', adding them here will add the needed + ;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see + ;; . + libunistring - ;; Depend on LIBLTDL, not LIBTOOL. That way, we avoid some the extra - ;; dependencies that LIBTOOL has, which is helpful during bootstrap. - ("libltdl" ,libltdl) + ;; Depend on LIBLTDL, not LIBTOOL. That way, we avoid some the extra + ;; dependencies that LIBTOOL has, which is helpful during bootstrap. + libltdl - ;; The headers and/or `guile-2.0.pc' refer to these packages, so they - ;; must be propagated. - ("bdw-gc" ,libgc) - ("gmp" ,gmp))) + ;; The headers and/or `guile-2.0.pc' refer to these packages, so they + ;; must be propagated. + libgc + gmp)) (outputs '("out" "debug")) @@ -247,7 +250,8 @@ (define-public guile-2.0 (license license:lgpl3+))) (define-public guile-2.2 - (package (inherit guile-2.0) + (package + (inherit guile-2.0) (name "guile") (version "2.2.7") (source (origin @@ -453,7 +457,7 @@ (define-public guile-next gnu-gettext texinfo gperf) - (replace "self" this-package))) + (replace "guile" this-package))) (synopsis "Development version of GNU Guile")))) (define* (make-guile-readline guile #:optional (name "guile-readline")) @@ -501,11 +505,9 @@ (define* (make-guile-readline guile #:optional (name "guile-readline")) #t))))) (home-page (package-home-page guile)) (native-inputs (package-native-inputs guile)) - (inputs - `(,@(package-inputs guile) ;to placate 'configure' - ,@(package-propagated-inputs guile) - ("guile" ,guile) - ("readline" ,readline))) + (propagated-inputs (package-propagated-inputs guile)) + (inputs (modify-inputs (package-inputs guile) + (prepend guile readline))) (synopsis "Line editing support for GNU Guile") (description "This module provides line editing support via the Readline library for