From 4b2d1d63d9d4ca2b44d735484a3c5fcbbad2ccf7 Mon Sep 17 00:00:00 2001
From: Patrick Norton <patrick.147.norton@gmail.com>
Date: Sun, 4 Jan 2026 09:09:45 -0500
Subject: gnu: Add go-cloud-google-com-go-civil.

* gnu/packages/golang-web.scm (go-cloud-google-com-go-civil): New
variable.
(go-cloud-google-com-go)[source] <snippet>: Delete "civil" directory.
[arguments] <test-subdirs>: Drop "civil" from scope.
(go-cloud-google-com-go-spanner):
[propagated-inputs]: Add go-cloud-google-com-go-civil.

Relates-to: guix/guix!5417
Modified-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang-web.scm | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4dcd0ebf321..d241517601f 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -395,6 +395,7 @@ devices.")
             ;; - cloud.google.com/go/trace
             (for-each delete-file-recursively
                       (list "auth"
+                            "civil"
                             "compute/metadata"
                             "iam"
                             "kms"
@@ -413,7 +414,6 @@ devices.")
       #~(list "-vet=off")
       #:test-subdirs
       #~(list "bigquery/internal/query"
-              "civil"
               "compute/metadata"
               "container/apiv1"
               "errorreporting"
@@ -574,6 +574,44 @@ automatic token management.")
 cloud.google.com/go/auth and golang.org/x/oauth2.")
     (license license:asl2.0)))
 
+(define-public go-cloud-google-com-go-civil
+  (package
+    (name "go-cloud-google-com-go-civil")
+    (version "0.123.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/googleapis/google-cloud-go")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00hp2c41zmh533ii43y20mrh1jsgqk8k49hw96rxz1kras7xy9vy"))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-26)))
+       (snippet #~(begin
+                    (define (delete-all-but directory . preserve)
+                      (with-directory-excursion directory
+                        (let* ((pred (negate (cut member <>
+                                                  (cons* "." ".." preserve))))
+                               (items (scandir "." pred)))
+                          (for-each (cut delete-file-recursively <>) items))))
+                    (delete-all-but "." "civil")))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "cloud.google.com/go/civil"
+      #:unpack-path "cloud.google.com/go"))
+    (native-inputs
+     (list go-github-com-google-go-cmp))
+    (home-page "https://pkg.go.dev/cloud.google.com/go/compute/metadata")
+    (synopsis "Go wrapper for Google Compute Engine metadata service")
+    (description
+     "This package provides access to Google Compute Engine (GCE) metadata and
+API service accounts for Go.")
+    (license license:asl2.0)))
+
 (define-public go-cloud-google-com-go-compute-metadata
   (package
     (name "go-cloud-google-com-go-compute-metadata")
@@ -936,6 +974,7 @@ its service definition.")
            go-github-com-envoyproxy-go-control-plane))
     (propagated-inputs
      (list go-cloud-google-com-go
+           go-cloud-google-com-go-civil
            go-cloud-google-com-go-iam
            go-cloud-google-com-go-longrunning
            go-cloud-google-com-go-monitoring
-- 
cgit v1.2.3