diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-11-28 12:01:28 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-16 18:05:58 +0200 |
| commit | e35dd13d8aa68706ae9630b87dd0558b8c49d6cf (patch) | |
| tree | 69d04e8eacbca3b9062b80f472092a027635a147 | |
| parent | ed9d47c6ae347c2ecf6c16ce52c08cb1fb2bd40f (diff) | |
| download | guix-e35dd13d8aa68706ae9630b87dd0558b8c49d6cf.tar.gz guix-e35dd13d8aa68706ae9630b87dd0558b8c49d6cf.zip | |
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
| -rw-r--r-- | guix/import/go.scm | 6 |
1 files changed, 5 insertions, 1 deletions
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 <public@yoctocell.xyz> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> +;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; 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))) |