Merge bitcoin/bitcoin#27811: guix: Clean up manifest

a51d7abf1e guix: Specify symbols in modules explicitly (Hennadii Stepanov)
47d51fb048 guix: Drop unneeded modules (Hennadii Stepanov)
57fdedd0e9 guix: Unify fetch methods (Hennadii Stepanov)

Pull request description:

  This PR cleans up the `contrib/guix/manifest.scm` in the following way:
  - Unneeded for a successful build modules have be dropped.
  - Some modules have been enhanced with `#:select` clauses, which improves maintainability (see the commit message for details).

ACKs for top commit:
  TheCharlatan:
    ACK a51d7abf1e

Tree-SHA512: 380a36d03ec303ff8700893cfaad75ca09d84a77fd08d6c6a1679ac96409014b36f0698eb071e09af25ad36f1bc62aec0eec1092146d879251c6a8cce586169b
This commit is contained in:
fanquake 2023-06-29 10:37:15 +01:00
commit d4018f0b6c
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -1,44 +1,37 @@
(use-modules (gnu) (use-modules (gnu packages)
(gnu packages)
(gnu packages autotools) (gnu packages autotools)
(gnu packages base) ((gnu packages bash) #:select (bash-minimal))
(gnu packages bash)
(gnu packages bison) (gnu packages bison)
(gnu packages certs) ((gnu packages certs) #:select (nss-certs))
(gnu packages cdrom) ((gnu packages cdrom) #:select (xorriso))
(gnu packages check) ((gnu packages cmake) #:select (cmake-minimal))
(gnu packages cmake)
(gnu packages commencement) (gnu packages commencement)
(gnu packages compression) (gnu packages compression)
(gnu packages cross-base) (gnu packages cross-base)
(gnu packages file) (gnu packages file)
(gnu packages gawk) (gnu packages gawk)
(gnu packages gcc) (gnu packages gcc)
(gnu packages gnome) ((gnu packages installers) #:select (nsis-x86_64))
(gnu packages installers) ((gnu packages linux) #:select (linux-libre-headers-5.15 util-linux))
(gnu packages linux)
(gnu packages llvm) (gnu packages llvm)
(gnu packages mingw) (gnu packages mingw)
(gnu packages moreutils) (gnu packages moreutils)
(gnu packages pkg-config) (gnu packages pkg-config)
(gnu packages python) ((gnu packages python) #:select (python-minimal))
((gnu packages python-build) #:select (python-tomli)) ((gnu packages python-build) #:select (python-tomli))
(gnu packages python-crypto) ((gnu packages python-crypto) #:select (python-asn1crypto))
(gnu packages python-web) ((gnu packages python-web) #:select (python-requests))
(gnu packages shells) ((gnu packages tls) #:select (openssl))
(gnu packages tls) ((gnu packages version-control) #:select (git-minimal))
(gnu packages version-control)
(guix build-system cmake) (guix build-system cmake)
(guix build-system gnu) (guix build-system gnu)
(guix build-system python) (guix build-system python)
(guix build-system trivial) (guix build-system trivial)
(guix download)
(guix gexp) (guix gexp)
(guix git-download) (guix git-download)
((guix licenses) #:prefix license:) ((guix licenses) #:prefix license:)
(guix packages) (guix packages)
(guix profiles) ((guix utils) #:select (substitute-keyword-arguments)))
(guix utils))
(define-syntax-rule (search-our-patches file-name ...) (define-syntax-rule (search-our-patches file-name ...)
"Return the list of absolute file names corresponding to each "Return the list of absolute file names corresponding to each
@ -254,12 +247,13 @@ and abstract ELF, PE and MachO formats.")
(name "osslsigncode") (name "osslsigncode")
(version "2.5") (version "2.5")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/mtrojnar/" (uri (git-reference
name "/archive/" version ".tar.gz")) (url "https://github.com/mtrojnar/osslsigncode")
(commit version)))
(sha256 (sha256
(base32 (base32
"03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv")))) "1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("openssl", openssl))) `(("openssl", openssl)))