~ruther/guix-local

e35dd13d8aa68706ae9630b87dd0558b8c49d6cf — Efraim Flashner 2 years ago ed9d47c
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
1 files changed, 5 insertions(+), 1 deletions(-)

M guix/import/go.scm
M guix/import/go.scm => guix/import/go.scm +5 -1
@@ 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)))