guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit e4b0d0330609a761d09ade41bf8c045b34b84e62
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Wed Apr 29 16:06:28 2026 +0200
gnu: git-minimal: Build without Python.
This breaks a cycle in git-minimal -> … -> python -> tk -> fontconfig ->
git-minimal when using non-builtin git download.
* gnu/packages/curl.scm (curl-minimal): New variable.
* gnu/packages/version-control.scm (git-minimal)[inputs]: Replace curl with
curl-minimal.
(git)[inputs]: Replace “curl” (minimal variant) and “curl-minimal”
with curl (default variant).
---
gnu/packages/curl.scm | 11 +++++++++++
gnu/packages/version-control.scm | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 9e07e96a7ad..7eb8129b47c 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -181,6 +181,17 @@ tunneling, and so on.")
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))))
+(define-public curl-minimal
+ (hidden-package
+ (package
+ (inherit curl)
+ (name "curl-minimal")
+ ;; Drop nghttp2.
+ (native-inputs (list perl pkg-config))
+ (inputs (list gnutls libidn libpsl mit-krb5 zlib))
+ ;; Disable tests to avoid circular dependencies.
+ (arguments (ensure-keyword-arguments arguments '(#:tests? #f))))))
+
(define-public curl-ssh
(package/inherit curl
(arguments
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 082239da48c..6565a0b7e3c 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -643,7 +643,7 @@ optimized for version control systems.")
(inputs
(list bash-minimal
coreutils-minimal
- curl ;for HTTP(S) access
+ curl-minimal ;for HTTP(S) access
expat ;for 'git push' over HTTP(S)
openssl
perl
@@ -861,7 +861,9 @@ everything from small to very large projects with speed and
efficiency.")
xmlto)))
(inputs
(modify-inputs inputs
+ (delete "curl" "curl-minimal") ;replace with real curl below
(append bash-minimal ;for wrap-program
+ curl
python ;for git-p4
;; For PCRE support in git grep (USE_LIBPCRE2).