[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/09: guix: import: Don't include indirect dependencies in go.
From: |
guix-commits |
Subject: |
08/09: guix: import: Don't include indirect dependencies in go. |
Date: |
Sat, 16 Dec 2023 12:22:44 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit e35dd13d8aa68706ae9630b87dd0558b8c49d6cf
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Nov 28 12:01:28 2023 +0200
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(-)
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)))
- branch master updated (d5298c5e33 -> 6aade039e1), guix-commits, 2023/12/16
- 05/09: gnu: fpc: Add support for powerpc-linux., guix-commits, 2023/12/16
- 03/09: gnu: fpc: Fix building on i686-linux., guix-commits, 2023/12/16
- 06/09: gnu: fpc: Add support for powerpc64le-linux., guix-commits, 2023/12/16
- 02/09: gnu: valgrind: Mark as unsupported on i586-gnu., guix-commits, 2023/12/16
- 07/09: gnu: fpc: Add support for aarch64-linux., guix-commits, 2023/12/16
- 08/09: guix: import: Don't include indirect dependencies in go.,
guix-commits <=
- 01/09: gnu: valgrind: Use correct glibc., guix-commits, 2023/12/16
- 09/09: guix: import: Report go version for go importer., guix-commits, 2023/12/16
- 04/09: gnu: fpc: Patch more dynamic-linker paths., guix-commits, 2023/12/16