(address . guix-patches@gnu.org)
20180315232807.4f06bcb3@centurylink.net
Hello Guix,
The attached patch fixes a regression in recursive git checkouts of
package source, which I believe was introduced in
6dff905e51202bbdebbad8811b6509584d12a796 (2017-09-05!)
This would have only affected 6 packages:
scheme@(guile-user)> (format #t "~{~a~%~}"
(fold-packages
(lambda (p r)
(if (and=> (package-source p)
(lambda (s)
(and (git-reference? (origin-uri s))
(git-reference-recursive? (origin-uri s)))))
(cons p r)
r))
'())
#<package brotli@0.1-1.e992cce gnu/packages/compression.scm:912 2928000>
#<package aseba@1.6.0-0.3b35de8 gnu/packages/robotics.scm:79 3199e40>
#<package cool-retro-term@1.0.1-1.dd799cf gnu/packages/terminals.scm:446 2e28b40>
#<package termite@13 gnu/packages/terminals.scm:102 2e25240>
#<package wget2@1.0.0 gnu/packages/wget.scm:126 2728900>
#<package zile-on-guile@2.4.14-0.fd09781 gnu/packages/zile.scm:83 3c660c0>
$8 = #t
`~Eric
From 7798ecb3e61b042e4af3c0501f32d6b8888c1a13 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 15 Mar 2018 23:25:01 -0500
Subject: [PATCH] git-download: Fix recursive checkouts.
* guix/git-download.scm (git-fetch)<build>: Fix match on INPUTS, which may
contain package outputs.
---
guix/git-download.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Toggle diff (15 lines)
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 731e549b3..33f102bc6 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -109,7 +109,7 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
;; grep, etc. to be in $PATH.
(set-path-environment-variable "PATH" '("bin")
(match '#+inputs
- (((names dirs) ...)
+ (((names dirs outputs ...) ...)
dirs)))
(or (git-fetch (getenv "git url") (getenv "git commit")
--
2.16.2
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlqrR9cACgkQ/XPKxxnT
JWaZ2w//XQ2CFpF4W8bGD+py/DeZ5sS1IAG491Ch9NeBqWCENRbwp3vEVZO9E+lE
dEkptrQDspdy3mC3o7kP/Ins/haatgaMFRrMdj7O2F6MN6ZntXUkPiGtf3Eu5OON
0lN2EQoAXN87Pyom3ApqCipfqvZkhWj7DE2Bp5pnBtf2TKLV+4BazSJlx+zgDGA9
fyPwd9CV2tmsDeEfRN0+I79uKhxsdA5hNvzNNDAd9uzZFJsEXKFU48dQ7qXn8zhF
uqoqRE1voeqAxjtuKaaNrBf0o+CMJyCaWRL0dSK4ZMzZEi7cH6OGs6i45CoNgVo+
IR6WEAZW02ItUigXg5mfQol4iGByH5xCOyMHUJCwNtNNMOsiNb0Is1NWHPtMODP6
v1H9H8MGtY48fXD5L8A+yG2bQqyMSUgqa5abR7kitru719dLvJRaDqoN1iEWde9M
k7MS2LXlCSesBsI+BqC4XOzlKbuBGY24c2B/gisFSPeK98Sm6T9A07ji2jBQcGY7
QQ41VuzZOkFRYHQJt++IdJ9016uSZ88PW5t0r4aNToTFys2H6jv70nmoGvw8yX3w
1BXiQIzZjFG48BfRPWgwmz4qR4olxkFJzx5jvelY8b7MfA9hdgdGSzyViUvyrKGC
et6S0ZDFNMYoEK1BncTD5+jGF+vT6oBh7MRl3tTwoTRCTdwh0CA=
=xe/t
-----END PGP SIGNATURE-----