bitcoin/bitcoin
1
1
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-05-17 23:56:39 +00:00
Code Issues Releases Activity

guix: remove input labels

Browse Source 
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/
This commit is contained in:
fanquake 2023-06-22 10:20:07 +01:00
parent 31ce305d46
commit a4980da1ce
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
contrib/guix/manifest.scm
View File

@ -80,11 +80,11 @@ FILE-NAME found in ./patches relative to the current file."
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t))) (arguments '(#:builder (begin (mkdir %output) #t)))
(propagated-inputs (propagated-inputs
`(("binutils" ,xbinutils) (list xbinutils
("libc" ,xlibc) xlibc
("libc:static" ,xlibc "static") xgcc
("gcc" ,xgcc) `(,xlibc "static")
("gcc-lib" ,xgcc "lib"))) `(,xgcc "lib")))
(synopsis (string-append "Complete GCC tool chain for " target)) (synopsis (string-append "Complete GCC tool chain for " target))
(description (string-append "This package provides a complete GCC tool (description (string-append "This package provides a complete GCC tool
chain for " target " development.")) chain for " target " development."))
@ -130,10 +130,10 @@ desirable for building Bitcoin Core release binaries."
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t))) (arguments '(#:builder (begin (mkdir %output) #t)))
(propagated-inputs (propagated-inputs
`(("binutils" ,xbinutils) (list xbinutils
("libc" ,pthreads-xlibc) pthreads-xlibc
("gcc" ,pthreads-xgcc) pthreads-xgcc
("gcc-lib" ,pthreads-xgcc "lib"))) `(,pthreads-xgcc "lib")))
(synopsis (string-append "Complete GCC tool chain for " target)) (synopsis (string-append "Complete GCC tool chain for " target))
(description (string-append "This package provides a complete GCC tool (description (string-append "This package provides a complete GCC tool
chain for " target " development.")) chain for " target " development."))
@ -198,8 +198,7 @@ and abstract ELF, PE and MachO formats.")
(base32 (base32
"1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz")))) "1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs (list openssl))
`(("openssl", openssl)))
(home-page "https://github.com/mtrojnar/osslsigncode") (home-page "https://github.com/mtrojnar/osslsigncode")
(synopsis "Authenticode signing and timestamping tool") (synopsis "Authenticode signing and timestamping tool")
(description "osslsigncode is a small tool that implements part of the (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.")
(files '("etc/ssl/certs/ca-certificates.crt"))))) (files '("etc/ssl/certs/ca-certificates.crt")))))
(propagated-inputs (propagated-inputs
`(("python-asn1crypto" ,python-asn1crypto) (list python-asn1crypto openssl))
("openssl" ,openssl)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -295,7 +293,7 @@ thus should be able to compile on most platforms where these exist.")
(package (inherit python-oscrypto) (package (inherit python-oscrypto)
(name "python-oscryptotests") (name "python-oscryptotests")
(propagated-inputs (propagated-inputs
`(("python-oscrypto" ,python-oscrypto))) (list python-oscrypto))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
@ -322,9 +320,9 @@ thus should be able to compile on most platforms where these exist.")
"1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k")))) "1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-asn1crypto" ,python-asn1crypto) (list python-asn1crypto
("python-oscrypto" ,python-oscrypto) python-oscrypto
("python-oscryptotests", python-oscryptotests))) ;; certvalidator tests import oscryptotests python-oscryptotests)) ;; certvalidator tests import oscryptotests
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -389,10 +387,10 @@ specific moment in time, whitelisting and revocation checks.")
"1nm6rm4h4m7kbq729si4cm8rzild62mk4ni8xr5zja7l33fhv3gb")))) "1nm6rm4h4m7kbq729si4cm8rzild62mk4ni8xr5zja7l33fhv3gb"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-asn1crypto" ,python-asn1crypto) (list python-asn1crypto
("python-oscrypto" ,python-oscrypto) python-oscrypto
("python-certvalidator" ,python-certvalidator) python-certvalidator
("python-elfesteem" ,python-elfesteem))) python-elfesteem))
;; There are no tests, but attempting to run python setup.py test leads to ;; There are no tests, but attempting to run python setup.py test leads to
;; problems, just disable the test ;; problems, just disable the test
(arguments '(#:tests? #f)) (arguments '(#:tests? #f))