From 0b898c594c0eb8e7621e6412ddf6d93af20848e6 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Thu, 25 Jul 2024 11:22:07 +0100
Subject: gnu: go-github-com-prometheus-procfs: Move to prometheus.

* gnu/packages/golang.scm (go-github-com-prometheus-procfs): Move from
here ...
* gnu/packages/prometheus.scm: ... to here. Remove (gnu packages golang)
module.

* gnu/packages/golang.scm: Remove (gnu packages prometheus) module.
* gnu/packages/prometheus.scm: Remove (gnu packages golang) module.

Change-Id: I3dd26ebc80c0a9fad47cec9887d6f52ad21bdc45
---
 gnu/packages/golang.scm     | 30 ------------------------------
 gnu/packages/prometheus.scm | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a81c4f8d02..3acc5588a5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -96,7 +96,6 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages prometheus)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages terminals)
@@ -7349,35 +7348,6 @@ system.")
 formatting information, rather than the current locale name.")
       (license license:expat))))
 
-(define-public go-github-com-prometheus-procfs
-  (package
-    (name "go-github-com-prometheus-procfs")
-    (version "0.15.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/prometheus/procfs")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/prometheus/procfs"
-       ;; The tests require Go modules, which are not yet supported in Guix's
-       ;; Go build system.
-       #:tests? #f))
-    (propagated-inputs
-     (list go-github-com-google-go-cmp
-           go-golang-org-x-sync
-           go-golang-org-x-sys))
-    (synopsis "Go library for reading @file{/proc}")
-    (description "The @code{procfs} Go package provides functions to retrieve
-system, kernel, and process metrics from the @file{/proc} pseudo file system.")
-    (home-page "https://github.com/prometheus/procfs")
-    (license license:asl2.0)))
-
 (define-public go-github-com-zalando-go-keyring
   (package
     (name "go-github-com-zalando-go-keyring")
diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm
index c61d107234..5ed3acaeb3 100644
--- a/gnu/packages/prometheus.scm
+++ b/gnu/packages/prometheus.scm
@@ -1,10 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019, 2020 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2024 Dominic Martinez <dom@dominicm.dev>
 ;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,7 +31,6 @@
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages)
-  #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-crypto)
@@ -331,6 +333,37 @@ using Amazon's Signature Verification V4 signing procedure, using credentials
 from the default AWS credential chain.")
     (license license:asl2.0)))
 
+(define-public go-github-com-prometheus-procfs
+  (package
+    (name "go-github-com-prometheus-procfs")
+    (version "0.15.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/prometheus/procfs")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "116ns8k1yjdj9a2vq5czlpmafrhy0yw5y0bcm1qqbqnn57agg68m"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/prometheus/procfs"
+      ;; The tests require Go modules, which are not yet supported in Guix's
+      ;; Go build system.
+      #:tests? #f))
+    (propagated-inputs
+     (list go-github-com-google-go-cmp
+           go-golang-org-x-sync
+           go-golang-org-x-sys))
+    (synopsis "Go library for reading @file{/proc}")
+    (home-page "https://github.com/prometheus/procfs")
+    (description
+     "The @code{procfs} Go package provides functions to retrieve system,
+kernel, and process metrics from the @file{/proc} pseudo file system.")
+    (license license:asl2.0)))
+
 ;;;
 ;;; Executables:
 ;;;
-- 
cgit v1.2.3