ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile: Use 'modify-inputs' where appropriate.

Browse source 
* gnu/packages/guile.scm (guile-3.0)[propagated-inputs]: Use
'modify-inputs'.
(guile-3.0/libgc-7)[propagated-inputs]: Likewise.
(guile-for-guile-emacs)[native-inputs]: Likewise.
* gnu/packages/make-bootstrap.scm (make-guile-static): Likewise.
This commit is contained in:
Ludovic Courtès 2021-09-30 00:03:14 +02:00
parent f17517d6c8
commit b00fbabdf6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/guile.scm
View file

@ -63,9 +63,7 @@ (define-module (gnu packages guile)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system guile) #:use-module (guix build-system guile)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (guix utils) #:use-module (guix utils))
#:use-module (ice-9 match)
#:use-module ((srfi srfi-1) #:prefix srfi-1:))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -327,9 +325,8 @@ (define-public guile-3.0
;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own ;; Build with the bundled mini-GMP to avoid interference with GnuTLS' own
;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>. ;; use of GMP via Nettle: <https://issues.guix.gnu.org/46330>.
(propagated-inputs (propagated-inputs
(srfi-1:fold srfi-1:alist-delete (modify-inputs (package-propagated-inputs guile-2.2)
(package-propagated-inputs guile-2.2) (delete "gmp" "libltdl")))
'("gmp" "libltdl")))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guile-2.0) (substitute-keyword-arguments (package-arguments guile-2.0)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
@ -394,8 +391,8 @@ (define-public guile-3.0/libgc-7
(package (package
(inherit guile-3.0-latest) (inherit guile-3.0-latest)
(propagated-inputs (propagated-inputs
`(("bdw-gc" ,libgc-7) (modify-inputs (package-propagated-inputs guile-3.0)
,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0))))))) (replace "bdw-gc" libgc-7))))))
(define-public guile-3.0/fixed (define-public guile-3.0/fixed
;; A package of Guile that's rarely changed. It is the one used in the ;; A package of Guile that's rarely changed. It is the one used in the
@ -596,18 +593,18 @@ (define-public guile-for-guile-emacs
;; FAIL: test-out-of-memory ;; FAIL: test-out-of-memory
(substitute* "test-suite/standalone/Makefile.am" (substitute* "test-suite/standalone/Makefile.am"
(("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") "")) (("(check_SCRIPTS|TESTS) \\+= test-out-of-memory") ""))
(patch-shebang "build-aux/git-version-gen") (patch-shebang "build-aux/git-version-gen")
(invoke "sh" "autogen.sh") (invoke "sh" "autogen.sh")
#t)))))) #t))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (modify-inputs (package-native-inputs guile-2.2)
("automake" ,automake) (prepend autoconf
("libtool" ,libtool) automake
("flex" ,flex) libtool
("texinfo" ,texinfo) flex
("gettext" ,gettext-minimal) texinfo
,@(package-native-inputs guile-2.2)))))) gettext-minimal))))))
;;; ;;;

9
gnu/packages/make-bootstrap.scm
View file

@ -686,13 +686,12 @@ (define* (make-guile-static guile patches)
(outputs (delete "debug" (package-outputs guile))) (outputs (delete "debug" (package-outputs guile)))
(inputs (inputs
`(("libunistring:static" ,libunistring "static") (modify-inputs (package-inputs guile)
,@(package-inputs guile))) (prepend `(,libunistring "static"))))
(propagated-inputs (propagated-inputs
`(("bdw-gc" ,libgc/static-libs) (modify-inputs (package-propagated-inputs guile)
,@(alist-delete "bdw-gc" (replace "bdw-gc" libgc/static-libs)))
(package-propagated-inputs guile))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guile) (substitute-keyword-arguments (package-arguments guile)
((#:configure-flags flags '()) ((#:configure-flags flags '())