Skip to content

Commit d4018f0

Browse files
committed
Merge bitcoin/bitcoin#27811: guix: Clean up manifest
a51d7ab guix: Specify symbols in modules explicitly (Hennadii Stepanov) 47d51fb guix: Drop unneeded modules (Hennadii Stepanov) 57fdedd 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 a51d7ab Tree-SHA512: 380a36d03ec303ff8700893cfaad75ca09d84a77fd08d6c6a1679ac96409014b36f0698eb071e09af25ad36f1bc62aec0eec1092146d879251c6a8cce586169b
2 parents e0cd745 + a51d7ab commit d4018f0

File tree

1 file changed

+18
-24
lines changed

1 file changed

+18
-24
lines changed

contrib/guix/manifest.scm

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,37 @@
1-
(use-modules (gnu)
2-
(gnu packages)
1+
(use-modules (gnu packages)
32
(gnu packages autotools)
4-
(gnu packages base)
5-
(gnu packages bash)
3+
((gnu packages bash) #:select (bash-minimal))
64
(gnu packages bison)
7-
(gnu packages certs)
8-
(gnu packages cdrom)
9-
(gnu packages check)
10-
(gnu packages cmake)
5+
((gnu packages certs) #:select (nss-certs))
6+
((gnu packages cdrom) #:select (xorriso))
7+
((gnu packages cmake) #:select (cmake-minimal))
118
(gnu packages commencement)
129
(gnu packages compression)
1310
(gnu packages cross-base)
1411
(gnu packages file)
1512
(gnu packages gawk)
1613
(gnu packages gcc)
17-
(gnu packages gnome)
18-
(gnu packages installers)
19-
(gnu packages linux)
14+
((gnu packages installers) #:select (nsis-x86_64))
15+
((gnu packages linux) #:select (linux-libre-headers-5.15 util-linux))
2016
(gnu packages llvm)
2117
(gnu packages mingw)
2218
(gnu packages moreutils)
2319
(gnu packages pkg-config)
24-
(gnu packages python)
20+
((gnu packages python) #:select (python-minimal))
2521
((gnu packages python-build) #:select (python-tomli))
26-
(gnu packages python-crypto)
27-
(gnu packages python-web)
28-
(gnu packages shells)
29-
(gnu packages tls)
30-
(gnu packages version-control)
22+
((gnu packages python-crypto) #:select (python-asn1crypto))
23+
((gnu packages python-web) #:select (python-requests))
24+
((gnu packages tls) #:select (openssl))
25+
((gnu packages version-control) #:select (git-minimal))
3126
(guix build-system cmake)
3227
(guix build-system gnu)
3328
(guix build-system python)
3429
(guix build-system trivial)
35-
(guix download)
3630
(guix gexp)
3731
(guix git-download)
3832
((guix licenses) #:prefix license:)
3933
(guix packages)
40-
(guix profiles)
41-
(guix utils))
34+
((guix utils) #:select (substitute-keyword-arguments)))
4235

4336
(define-syntax-rule (search-our-patches file-name ...)
4437
"Return the list of absolute file names corresponding to each
@@ -254,12 +247,13 @@ and abstract ELF, PE and MachO formats.")
254247
(name "osslsigncode")
255248
(version "2.5")
256249
(source (origin
257-
(method url-fetch)
258-
(uri (string-append "https://github.com/mtrojnar/"
259-
name "/archive/" version ".tar.gz"))
250+
(method git-fetch)
251+
(uri (git-reference
252+
(url "https://github.com/mtrojnar/osslsigncode")
253+
(commit version)))
260254
(sha256
261255
(base32
262-
"03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv"))))
256+
"1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
263257
(build-system cmake-build-system)
264258
(inputs
265259
`(("openssl", openssl)))

0 commit comments

Comments
 (0)