From e35dd13d8aa68706ae9630b87dd0558b8c49d6cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Nov 2023 12:01:28 +0200 Subject: guix: import: Don't include indirect dependencies in go. * guix/import/go.scm (parse-go.mod)[define-peg-patern require]: Adjust the peg pattern to reject lines with the 'indirect' comment in them. Change-Id: I9618bbaa1cb8c6549ced875e3c8d32afc72c3b9b --- guix/import/go.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'guix/import') diff --git a/guix/import/go.scm b/guix/import/go.scm index 0357e6a1eb..940cdac4b0 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -293,7 +294,10 @@ comment, or unknown) and is followed by the indicated data." ;; The following directives may all be used solo or in a block ;; RequireSpec = ModulePath Version newline . - (define-peg-pattern require all (and module-path version EOL)) + (define-peg-pattern require all + (and module-path version + ;; We don't want the transitive dependencies. + (not-followed-by (and (* WS) "//" (* WS) "indirect")) EOL)) (define-peg-pattern require-top body (and (ignore "require") (or (and block-start (* (or require block-line)) block-end) require))) -- cgit v1.2.3