amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Change inputs of core packages to plain lists.

Browse source 
This is transparent: the resulting derivations are unchanged.

* gnu/packages/base.scm (grep, sed, tar, patch, diffutils, glibc/hurd-headers)
(coreutils, gnu-make, make-glibc-utf8-locales): Change input fields to
plain package lists and use 'modify-inputs'.
* 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, guile-next): Likewise.
* gnu/packages/mes.scm (nyacc-0.86, nyacc-0.99)
(nyacc, nyacc-1.00.2, mes-0.19, mes, m2-planet): Likewise.
This commit is contained in:
Ludovic Courtès 2021-05-20 15:49:32 +02:00
parent 04b2f3dd80
commit 2f73ea3487
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 59 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

48
gnu/packages/base.scm
View file

@ -109,8 +109,8 @@ command-line arguments, multiple languages, and so on.")
"0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6")) "0gipv6bzkm1aihj0ncqpyh164xrzgcxcv9r1kwzyk2g1mzl1azk6"))
(patches (search-patches "grep-timing-sensitive-test.patch")))) (patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) ;some of the tests require it (native-inputs (list perl)) ;some of the tests require it
(inputs `(("pcre" ,pcre))) (inputs (list pcre))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -161,8 +161,7 @@ including, for example, recursive directory searching.")
(modules '((guix build utils))))) (modules '((guix build utils)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Stream editor") (synopsis "Stream editor")
(native-inputs (native-inputs (list perl)) ;for tests
`(("perl" ,perl))) ;for tests
(description (description
"Sed is a non-interactive, text stream editor. It receives a text "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 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 ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able
;; to refer to the target Bash. ;; to refer to the target Bash.
(inputs (if (%current-target-system) (inputs (if (%current-target-system)
`(("bash" ,bash)) (list bash)
'())) '()))
(synopsis "Managing tar archives") (synopsis "Managing tar archives")
@ -248,7 +247,7 @@ standard utility.")
(if (%current-target-system) (if (%current-target-system)
`(#:configure-flags '("gl_cv_func_working_mktime=yes")) `(#:configure-flags '("gl_cv_func_working_mktime=yes"))
'())) '()))
(native-inputs `(("ed" ,ed))) (native-inputs (list ed))
(synopsis "Apply differences to originals, with optional backups") (synopsis "Apply differences to originals, with optional backups")
(description (description
"Patch is a program that applies changes to files based on differences "Patch is a program that applies changes to files based on differences
@ -271,7 +270,7 @@ differences.")
(base32 (base32
"09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")))) "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) (native-inputs (list perl))
(synopsis "Comparing and merging files") (synopsis "Comparing and merging files")
(description (description
"GNU Diffutils is a package containing tools for finding the "GNU Diffutils is a package containing tools for finding the
@ -331,16 +330,16 @@ used to apply commands with arbitrarily long arguments.")
(patches (search-patches "coreutils-ls.patch" (patches (search-patches "coreutils-ls.patch"
"coreutils-gnulib-tests.patch")))) "coreutils-gnulib-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("acl" ,acl) ; TODO: add SELinux (inputs `(,acl ;TODO: add SELinux
("attr" ,attr) ;for xattrs in ls, mv, etc ,attr ;for xattrs in ls, mv, etc
("gmp" ,gmp) ;bignums in 'expr', yay! ,gmp ;bignums in 'expr', yay!
;; Do not use libcap when cross-compiling since it's not quite ;; Do not use libcap when cross-compiling since it's not quite
;; cross-compilable; and use it only for supported systems. ;; cross-compilable; and use it only for supported systems.
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(member (%current-system) (member (%current-system)
(package-supported-systems libcap))) (package-supported-systems libcap)))
`(("libcap" ,libcap)) ;capability support in 'ls', etc. `(,libcap) ;capability support in 'ls', etc.
'()))) '())))
(native-inputs (native-inputs
;; Perl is needed to run tests in native builds, and to run the bundled ;; Perl is needed to run tests in native builds, and to run the bundled
@ -349,7 +348,7 @@ used to apply commands with arbitrarily long arguments.")
;; for help2man. ;; for help2man.
(if (%current-target-system) (if (%current-target-system)
'() '()
`(("perl" ,perl)))) (list perl)))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
`(#:parallel-build? #f ; help2man may be called too early `(#:parallel-build? #f ; help2man may be called too early
@ -448,8 +447,8 @@ standard.")
"06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0")) "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"))
(patches (search-patches "make-impure-dirs.patch")))) (patches (search-patches "make-impure-dirs.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile (native-inputs (list pkg-config)) ;to detect Guile
(inputs `(("guile" ,guile-3.0))) (inputs (list guile-3.0))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments
`(,@(if (hurd-target?) `(,@(if (hurd-target?)
@ -1155,8 +1154,7 @@ to the @code{share/locale} sub-directory of this package.")
locale ".UTF-8"))) locale ".UTF-8")))
',locales) ',locales)
#t)))) #t))))
(native-inputs `(("glibc" ,glibc) (native-inputs (list glibc gzip))
("gzip" ,gzip)))
(synopsis (if default-locales? (synopsis (if default-locales?
(P_ "Small sample of UTF-8 locales") (P_ "Small sample of UTF-8 locales")
(P_ "Customized sample of UTF-8 locales"))) (P_ "Customized sample of UTF-8 locales")))
@ -1209,17 +1207,15 @@ command.")
(package (inherit glibc) (package (inherit glibc)
(name "glibc-hurd-headers") (name "glibc-hurd-headers")
(outputs '("out")) (outputs '("out"))
(propagated-inputs `(("gnumach-headers" ,gnumach-headers) (propagated-inputs (list gnumach-headers hurd-headers))
("hurd-headers" ,hurd-headers)))
(native-inputs (native-inputs
`(("mig" ,(if (%current-target-system) (modify-inputs (package-native-inputs glibc)
;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, (prepend (if (%current-target-system)
;; hence this hack. ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
(package ;; hence this hack.
(inherit mig) (package (inherit mig)
(arguments `(#:system "i686-linux"))) (arguments `(#:system "i686-linux")))
mig)) mig))))
,@(package-native-inputs glibc)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments glibc) (substitute-keyword-arguments (package-arguments glibc)
;; We just pass the flags really needed to build the headers. ;; We just pass the flags really needed to build the headers.

103
gnu/packages/guile.scm
View file

@ -112,13 +112,11 @@
`(("self" ,this-package)) `(("self" ,this-package))
'())) '()))
(inputs `(("gawk" ,gawk) (inputs (list gawk readline))
("readline" ,readline)))
;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be
;; propagated. ;; propagated.
(propagated-inputs `(("gmp" ,gmp) (propagated-inputs (list gmp libltdl))
("libltdl" ,libltdl)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
@ -411,14 +409,14 @@ without requiring the source code to be rewritten.")
(delete-file "test-suite/tests/version.test") (delete-file "test-suite/tests/version.test")
#t)))))) #t))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (modify-inputs (package-native-inputs guile-3.0)
("automake" ,automake) (prepend autoconf
("libtool" ,libtool) automake
("flex" ,flex) libtool
("gettext" ,gnu-gettext) flex
("texinfo" ,texinfo) gnu-gettext
("gperf" ,gperf) texinfo
,@(package-native-inputs guile-3.0))) gperf)))
(synopsis "Development version of GNU Guile")))) (synopsis "Development version of GNU Guile"))))
(define* (make-guile-readline guile #:optional (name "guile-readline")) (define* (make-guile-readline guile #:optional (name "guile-readline"))
@ -604,9 +602,8 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs (list pkg-config guile-2.2))
("guile" ,guile-2.2))) (inputs (list guile-2.2))
(inputs `(("guile" ,guile-2.2)))
(synopsis "JSON module for Guile") (synopsis "JSON module for Guile")
(description (description
"Guile-JSON supports parsing and building JSON documents according to the "Guile-JSON supports parsing and building JSON documents according to the
@ -644,9 +641,8 @@ specification. These are the main features:
(sha256 (sha256
(base32 (base32
"0nj0684qgh6ppkbdyxqfyjwsv2qbyairxpi8fzrhsi3xnc7jn4im")))) "0nj0684qgh6ppkbdyxqfyjwsv2qbyairxpi8fzrhsi3xnc7jn4im"))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs (list pkg-config guile-3.0))
("guile" ,guile-3.0))) (inputs (list guile-3.0))))
(inputs `(("guile" ,guile-3.0)))))
(define-public guile3.0-json (define-public guile3.0-json
(deprecated-package "guile3.0-json" guile-json-3)) (deprecated-package "guile3.0-json" guile-json-3))
@ -705,10 +701,8 @@ specification. These are the main features:
(format #f "(dynamic-link \"~a/lib/libgdbm.so\")" (format #f "(dynamic-link \"~a/lib/libgdbm.so\")"
(assoc-ref inputs "gdbm")))) (assoc-ref inputs "gdbm"))))
#t))))) #t)))))
(native-inputs (native-inputs (list guile-3.0))
`(("guile" ,guile-3.0))) (inputs (list gdbm))
(inputs
`(("gdbm" ,gdbm)))
(home-page "https://github.com/ijp/guile-gdbm") (home-page "https://github.com/ijp/guile-gdbm")
(synopsis "Guile bindings to the GDBM library via Guile's FFI") (synopsis "Guile bindings to the GDBM library via Guile's FFI")
(description (description
@ -739,14 +733,8 @@ Guile's foreign function interface.")
"1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928")) "1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list autoconf automake guile-3.0 pkg-config))
`(("autoconf" ,autoconf) (inputs (list guile-3.0 sqlite))
("automake" ,automake)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)))
(inputs
`(("guile" ,guile-3.0)
("sqlite" ,sqlite)))
(synopsis "Access SQLite databases from Guile") (synopsis "Access SQLite databases from Guile")
(description (description
"This package provides Guile bindings to the SQLite database system.") "This package provides Guile bindings to the SQLite database system.")
@ -786,13 +774,8 @@ Guile's foreign function interface.")
(doc (string-append out "/share/doc/" package))) (doc (string-append out "/share/doc/" package)))
(install-file "README.md" doc) (install-file "README.md" doc)
#t)))))) #t))))))
(native-inputs (native-inputs (list autoconf automake pkg-config guile-3.0))
`(("autoconf" ,autoconf) (inputs (list guile-3.0))
("automake" ,automake)
("pkg-config" ,pkg-config)
("guile" ,guile-3.0)))
(inputs
`(("guile" ,guile-3.0)))
(synopsis "Structured access to bytevector contents for Guile") (synopsis "Structured access to bytevector contents for Guile")
(description (description
"Guile bytestructures offers a system imitating the type system "Guile bytestructures offers a system imitating the type system
@ -829,17 +812,11 @@ type system, elevating types to first-class status.")
(arguments (arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
("guile" ,guile-3.0)
("guile-bytestructures" ,guile-bytestructures)))
(inputs (inputs
`(("guile" ,guile-3.0) (list guile-3.0 libgit2))
("libgit2" ,libgit2)))
(propagated-inputs (propagated-inputs
`(("guile-bytestructures" ,guile-bytestructures))) (list guile-bytestructures))
(synopsis "Guile bindings for libgit2") (synopsis "Guile bindings for libgit2")
(description (description
"This package provides Guile bindings to libgit2, a library to "This package provides Guile bindings to libgit2, a library to
@ -876,16 +853,8 @@ manipulate repositories of the Git version control system.")
(arguments (arguments
'(#:make-flags '(#:make-flags
'("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs (native-inputs (list autoconf automake pkg-config guile-3.0))
`(("autoconf" ,autoconf) (inputs (list guile-3.0 zlib))
("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)))
(synopsis "Guile bindings to zlib") (synopsis "Guile bindings to zlib")
(description (description
"This package provides Guile bindings for zlib, a lossless "This package provides Guile bindings for zlib, a lossless
@ -915,16 +884,8 @@ Guile's foreign function interface.")
(arguments (arguments
'(#:make-flags '(#:make-flags
'("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs (native-inputs (list autoconf automake pkg-config guile-3.0))
`(("autoconf" ,autoconf) (inputs (list guile-3.0 lzlib))
("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)))
(synopsis "Guile bindings to lzlib") (synopsis "Guile bindings to lzlib")
(description (description
"This package provides Guile bindings for lzlib, a C library for "This package provides Guile bindings for lzlib, a C library for
@ -950,14 +911,8 @@ pure Scheme by using Guile's foreign function interface.")
(base32 (base32
"1c8l7829b5yx8wdc0mrhzjfwb6h9hb7cd8dfxcr71a7vlsi86310")))) "1c8l7829b5yx8wdc0mrhzjfwb6h9hb7cd8dfxcr71a7vlsi86310"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list autoconf automake pkg-config guile-3.0))
`(("autoconf" ,autoconf) (inputs (list `(,zstd "lib") guile-3.0))
("automake" ,automake)
("pkg-config" ,pkg-config)
("guile" ,guile-3.0)))
(inputs
`(("zstd" ,zstd "lib")
("guile" ,guile-3.0)))
(synopsis "GNU Guile bindings to the zstd compression library") (synopsis "GNU Guile bindings to the zstd compression library")
(description (description
"This package provides a GNU Guile interface to the zstd (``zstandard'') "This package provides a GNU Guile interface to the zstd (``zstandard'')

25
gnu/packages/mes.scm
View file

@ -56,8 +56,7 @@
(base32 (base32
"0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9")))) "0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list guile-2.2))
`(("guile" ,guile-2.2)))
(synopsis "LALR(1) Parser Generator in Guile") (synopsis "LALR(1) Parser Generator in Guile")
(description (description
"NYACC is an LALR(1) parser generator implemented in Guile. "NYACC is an LALR(1) parser generator implemented in Guile.
@ -92,10 +91,8 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(("^DOCDIR =.*") (("^DOCDIR =.*")
"DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n")) "DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n"))
#t)))) #t))))
(native-inputs (native-inputs (list pkg-config))
`(("pkg-config" ,pkg-config))) (inputs (list guile-2.2))))
(inputs
`(("guile" ,guile-2.2)))))
(define-public nyacc (define-public nyacc
(package (package
@ -116,8 +113,7 @@ extensive examples, including parsers for the Javascript and C99 languages.")
"GUILE_GLOBAL_SITE=\ "GUILE_GLOBAL_SITE=\
$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
#t)))) #t))))
(inputs (inputs (list guile-3.0))))
`(("guile" ,guile-3.0)))))
(define-public nyacc-1.00.2 (define-public nyacc-1.00.2
(package (package
@ -145,8 +141,7 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
(sha256 (sha256
(base32 (base32
"065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk")))) "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk"))))
(inputs (inputs (list guile-2.2))))
`(("guile" ,guile-2.2)))))
(define-public mes-0.19 (define-public mes-0.19
;; Mes used for bootstrap. ;; Mes used for bootstrap.
@ -162,9 +157,7 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
"15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs (list mescc-tools-0.5.2 nyacc-0.86))
`(("mescc-tools" ,mescc-tools-0.5.2)
("nyacc" ,nyacc-0.86)))
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
,@(let ((target-system (or (%current-target-system) ,@(let ((target-system (or (%current-target-system)
@ -205,9 +198,7 @@ Guile.")
(base32 (base32
"0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s")))) "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s"))))
(supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs (list mescc-tools nyacc-1.00.2))
`(("mescc-tools" ,mescc-tools)
("nyacc" ,nyacc-1.00.2)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "C_INCLUDE_PATH") (variable "C_INCLUDE_PATH")
@ -377,7 +368,7 @@ get_machine.")
(base32 (base32
"0yyc0fcbbxi9jqa1n76x0rwspdrwmc8g09jlmsw9c35nflrhmz8q")))) "0yyc0fcbbxi9jqa1n76x0rwspdrwmc8g09jlmsw9c35nflrhmz8q"))))
(native-inputs (native-inputs
`(("mescc-tools" ,mescc-tools))) (list mescc-tools))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))