From 57fdedd0e9269888c9a3c0ec76521dc66924299c Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 3 Jun 2023 08:11:56 +0100 Subject: [PATCH 1/3] guix: Unify fetch methods --- contrib/guix/manifest.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index b77a2a8efe6..16e4ff46105 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -32,7 +32,6 @@ (guix build-system gnu) (guix build-system python) (guix build-system trivial) - (guix download) (guix gexp) (guix git-download) ((guix licenses) #:prefix license:) @@ -254,12 +253,13 @@ and abstract ELF, PE and MachO formats.") (name "osslsigncode") (version "2.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mtrojnar/" - name "/archive/" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtrojnar/osslsigncode") + (commit version))) (sha256 (base32 - "03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv")))) + "1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz")))) (build-system cmake-build-system) (inputs `(("openssl", openssl))) From 47d51fb048f892db843e765beb4ff03f982ff0b5 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:49:55 +0100 Subject: [PATCH 2/3] guix: Drop unneeded modules --- contrib/guix/manifest.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 16e4ff46105..c0bd6cb0fd9 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -1,12 +1,9 @@ -(use-modules (gnu) - (gnu packages) +(use-modules (gnu packages) (gnu packages autotools) - (gnu packages base) (gnu packages bash) (gnu packages bison) (gnu packages certs) (gnu packages cdrom) - (gnu packages check) (gnu packages cmake) (gnu packages commencement) (gnu packages compression) @@ -14,7 +11,6 @@ (gnu packages file) (gnu packages gawk) (gnu packages gcc) - (gnu packages gnome) (gnu packages installers) (gnu packages linux) (gnu packages llvm) @@ -25,7 +21,6 @@ ((gnu packages python-build) #:select (python-tomli)) (gnu packages python-crypto) (gnu packages python-web) - (gnu packages shells) (gnu packages tls) (gnu packages version-control) (guix build-system cmake) @@ -36,7 +31,6 @@ (guix git-download) ((guix licenses) #:prefix license:) (guix packages) - (guix profiles) (guix utils)) (define-syntax-rule (search-our-patches file-name ...) From a51d7abf1e13c532c7acf437c3a65a9511b44987 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:37:21 +0100 Subject: [PATCH 3/3] guix: Specify symbols in modules explicitly This change improves the maintainability of the manifest: (1) It allows to remove the module when the specified symbols are no longer used. (2) It prevents accidental use of other symbols, such as `bash` instead of `bash-minimal`. --- contrib/guix/manifest.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index c0bd6cb0fd9..a9654dec5bc 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -1,28 +1,28 @@ (use-modules (gnu packages) (gnu packages autotools) - (gnu packages bash) + ((gnu packages bash) #:select (bash-minimal)) (gnu packages bison) - (gnu packages certs) - (gnu packages cdrom) - (gnu packages cmake) + ((gnu packages certs) #:select (nss-certs)) + ((gnu packages cdrom) #:select (xorriso)) + ((gnu packages cmake) #:select (cmake-minimal)) (gnu packages commencement) (gnu packages compression) (gnu packages cross-base) (gnu packages file) (gnu packages gawk) (gnu packages gcc) - (gnu packages installers) - (gnu packages linux) + ((gnu packages installers) #:select (nsis-x86_64)) + ((gnu packages linux) #:select (linux-libre-headers-5.15 util-linux)) (gnu packages llvm) (gnu packages mingw) (gnu packages moreutils) (gnu packages pkg-config) - (gnu packages python) + ((gnu packages python) #:select (python-minimal)) ((gnu packages python-build) #:select (python-tomli)) - (gnu packages python-crypto) - (gnu packages python-web) - (gnu packages tls) - (gnu packages version-control) + ((gnu packages python-crypto) #:select (python-asn1crypto)) + ((gnu packages python-web) #:select (python-requests)) + ((gnu packages tls) #:select (openssl)) + ((gnu packages version-control) #:select (git-minimal)) (guix build-system cmake) (guix build-system gnu) (guix build-system python) @@ -31,7 +31,7 @@ (guix git-download) ((guix licenses) #:prefix license:) (guix packages) - (guix utils)) + ((guix utils) #:select (substitute-keyword-arguments))) (define-syntax-rule (search-our-patches file-name ...) "Return the list of absolute file names corresponding to each