Skip to content

Commit a4980da

Browse files
committed
guix: remove input labels
Migrate package definitions to use the new format for propogated inputs. See https://guix.gnu.org/manual/en/html_node/package-Reference.html#index-inputs_002c-of-packages. See also: https://guix.gnu.org/blog/2021/the-big-change/
1 parent 31ce305 commit a4980da

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

contrib/guix/manifest.scm

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ FILE-NAME found in ./patches relative to the current file."
8080
(build-system trivial-build-system)
8181
(arguments '(#:builder (begin (mkdir %output) #t)))
8282
(propagated-inputs
83-
`(("binutils" ,xbinutils)
84-
("libc" ,xlibc)
85-
("libc:static" ,xlibc "static")
86-
("gcc" ,xgcc)
87-
("gcc-lib" ,xgcc "lib")))
83+
(list xbinutils
84+
xlibc
85+
xgcc
86+
`(,xlibc "static")
87+
`(,xgcc "lib")))
8888
(synopsis (string-append "Complete GCC tool chain for " target))
8989
(description (string-append "This package provides a complete GCC tool
9090
chain for " target " development."))
@@ -130,10 +130,10 @@ desirable for building Bitcoin Core release binaries."
130130
(build-system trivial-build-system)
131131
(arguments '(#:builder (begin (mkdir %output) #t)))
132132
(propagated-inputs
133-
`(("binutils" ,xbinutils)
134-
("libc" ,pthreads-xlibc)
135-
("gcc" ,pthreads-xgcc)
136-
("gcc-lib" ,pthreads-xgcc "lib")))
133+
(list xbinutils
134+
pthreads-xlibc
135+
pthreads-xgcc
136+
`(,pthreads-xgcc "lib")))
137137
(synopsis (string-append "Complete GCC tool chain for " target))
138138
(description (string-append "This package provides a complete GCC tool
139139
chain for " target " development."))
@@ -198,8 +198,7 @@ and abstract ELF, PE and MachO formats.")
198198
(base32
199199
"1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
200200
(build-system cmake-build-system)
201-
(inputs
202-
`(("openssl", openssl)))
201+
(inputs (list openssl))
203202
(home-page "https://github.com/mtrojnar/osslsigncode")
204203
(synopsis "Authenticode signing and timestamping tool")
205204
(description "osslsigncode is a small tool that implements part of the
@@ -256,8 +255,7 @@ thus should be able to compile on most platforms where these exist.")
256255
(files '("etc/ssl/certs/ca-certificates.crt")))))
257256

258257
(propagated-inputs
259-
`(("python-asn1crypto" ,python-asn1crypto)
260-
("openssl" ,openssl)))
258+
(list python-asn1crypto openssl))
261259
(arguments
262260
`(#:phases
263261
(modify-phases %standard-phases
@@ -295,7 +293,7 @@ thus should be able to compile on most platforms where these exist.")
295293
(package (inherit python-oscrypto)
296294
(name "python-oscryptotests")
297295
(propagated-inputs
298-
`(("python-oscrypto" ,python-oscrypto)))
296+
(list python-oscrypto))
299297
(arguments
300298
`(#:tests? #f
301299
#:phases
@@ -322,9 +320,9 @@ thus should be able to compile on most platforms where these exist.")
322320
"1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
323321
(build-system python-build-system)
324322
(propagated-inputs
325-
`(("python-asn1crypto" ,python-asn1crypto)
326-
("python-oscrypto" ,python-oscrypto)
327-
("python-oscryptotests", python-oscryptotests))) ;; certvalidator tests import oscryptotests
323+
(list python-asn1crypto
324+
python-oscrypto
325+
python-oscryptotests)) ;; certvalidator tests import oscryptotests
328326
(arguments
329327
`(#:phases
330328
(modify-phases %standard-phases
@@ -389,10 +387,10 @@ specific moment in time, whitelisting and revocation checks.")
389387
"1nm6rm4h4m7kbq729si4cm8rzild62mk4ni8xr5zja7l33fhv3gb"))))
390388
(build-system python-build-system)
391389
(propagated-inputs
392-
`(("python-asn1crypto" ,python-asn1crypto)
393-
("python-oscrypto" ,python-oscrypto)
394-
("python-certvalidator" ,python-certvalidator)
395-
("python-elfesteem" ,python-elfesteem)))
390+
(list python-asn1crypto
391+
python-oscrypto
392+
python-certvalidator
393+
python-elfesteem))
396394
;; There are no tests, but attempting to run python setup.py test leads to
397395
;; problems, just disable the test
398396
(arguments '(#:tests? #f))

0 commit comments

Comments
 (0)