sharlatan pushed a commit to branch go-team
in repository guix.
commit af91c42a4400572a28cd175011af2cae13353108
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Thu Feb 13 14:01:00 2025 +0000
gnu: ssh-to-pgp: Move to golang-crypto.
This change slightly improves cross reference and cycle between modules.
* gnu/packages/crypto.scm: Remove (gnu packages golang-crypto), (gnu
packages golang-build) and (guix build-system go).
(ssh-to-pgp): Move from here ...
* gnu/packages/golang-crypto.scm: ... to here.
Change-Id: I5b59e19704e212fca917de30c9b3b3e0dc4da80b
---
gnu/packages/crypto.scm | 33 ---------------------------------
gnu/packages/golang-crypto.scm | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index bbbe4a1ba0..e9add27dac 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -62,8 +62,6 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnupg)
- #:use-module (gnu packages golang-crypto)
- #:use-module (gnu packages golang-build)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages kerberos)
@@ -101,7 +99,6 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system go)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix utils)
@@ -1661,36 +1658,6 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and
descrypt.")
(home-page "https://github.com/besser82/libxcrypt";)
(license license:lgpl2.1)))
-(define-public ssh-to-pgp
- (package
- (name "ssh-to-pgp")
- (version "1.1.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Mic92/ssh-to-pgp";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1xaj6pnk5y2flnxm57j9bpdpll9vhg1rbjj4v3a7hn1gginxpprx"))))
- (build-system go-build-system)
- (arguments
- (list
- #:install-source? #f
- #:import-path "github.com/Mic92/ssh-to-pgp"
- ;; failed: No secret key
- #:test-flags #~(list "-skip" "TestCli")))
- (native-inputs
- (list gnupg
- go-github-com-protonmail-go-crypto
- go-golang-org-x-crypto))
- (home-page "https://github.com/Mic92/ssh-to-pgp";)
- (synopsis "Convert SSH RSA keys to GPG keys")
- (description "This package provides @code{ssh-to-pgp}: a Go command line
-+utility to convert SSH RSA keys to GPG keys.")
- (license license:expat)))
-
(define-public keychain
(package
(name "keychain")
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index ef5879ba73..f2ab6efef5 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -2648,6 +2648,36 @@ tools."))))
" This package provides an command line interface (CLI)
tool."))))
+(define-public ssh-to-pgp
+ (package
+ (name "ssh-to-pgp")
+ (version "1.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Mic92/ssh-to-pgp";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xaj6pnk5y2flnxm57j9bpdpll9vhg1rbjj4v3a7hn1gginxpprx"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:import-path "github.com/Mic92/ssh-to-pgp"
+ ;; failed: No secret key
+ #:test-flags #~(list "-skip" "TestCli")))
+ (native-inputs
+ (list gnupg
+ go-github-com-protonmail-go-crypto
+ go-golang-org-x-crypto))
+ (home-page "https://github.com/Mic92/ssh-to-pgp";)
+ (synopsis "Convert SSH RSA keys to GPG keys")
+ (description "This package provides @code{ssh-to-pgp}: a Go command line
++utility to convert SSH RSA keys to GPG keys.")
+ (license license:expat)))
+
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
