From: "Ludovic Courtès" <ludo@gnu.org>
To: 61790@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>, andreas@enge.fr
Subject: [bug#61790] [PATCH core-updates 1/5] gnu: guile: Remove input labels.
Date: Sat, 25 Feb 2023 20:00:26 +0100 [thread overview]
Message-ID: <20230225190030.5289-1-ludo@gnu.org> (raw)
In-Reply-To: <20230225185544.5152-1-ludo@gnu.org>
* 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 <ludo@gnu.org>
+;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
@@ -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
- ;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>.
- ("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
+ ;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>.
+ 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
--
2.39.1
next prev parent reply other threads:[~2023-02-25 19:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-25 18:55 [bug#61790] [PATCH core-updates 0/5] Package cleanups: Guile, GnuTLS, ncurses Ludovic Courtès
2023-02-25 19:00 ` Ludovic Courtès [this message]
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 2/5] gnu: gnutls: Remove Guile dependency Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 3/5] gnu: gnutls: Deprecate 'gnutls-latest' Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 4/5] gnu: gettext: Remove input label Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 5/5] gnu: ncurses: Rewrite using gexps Ludovic Courtès
2023-02-25 22:14 ` [bug#61790] [PATCH core-updates 0/5] Package cleanups: Guile, GnuTLS, ncurses Ludovic Courtès
2023-02-26 12:29 ` Andreas Enge
2023-02-26 17:16 ` Ludovic Courtès
2023-02-26 17:25 ` Andreas Enge
2023-02-26 21:50 ` bug#61790: " Ludovic Courtès
2023-02-26 12:31 ` [bug#61790] " Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230225190030.5289-1-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=61790@debbugs.gnu.org \
--cc=andreas@enge.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.