[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Tomáš Čech]

* gnu/packages/syncthing.scm (go-golang-org-x-crypto-ssh-terminal): New
variable.
---
 gnu/packages/syncthing.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4c607600d..a6cff9759 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Petter <petter@mykolab.ch>
 ;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1200,6 +1201,44 @@ Tiny Encryption Algorithm (XTEA) block cipher.")
       (home-page "https://go.googlesource.com/crypto/")
       (license bsd-3))))
 
+(define-public go-golang-org-x-crypto-ssh-terminal
+  (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-crypto-ssh-terminal")
+      (version (git-version "0.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://go.googlesource.com/crypto")
+                      (commit commit)))
+                (file-name (string-append "go.googlesource.com-crypto-"
+                                          version "-checkout"))
+                (sha256
+                 (base32
+                  "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx"))))
+      (build-system go-build-system)
+      (inputs
+       `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+      (arguments
+       `(#:import-path "golang.org/x/crypto/ssh/terminal"
+         #:unpack-path "golang.org/x/crypto"
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable
+             (lambda* (#:key outputs #:allow-other-keys)
+               (map (lambda (file)
+                      (make-file-writable file))
+                    (find-files
+                      (string-append (assoc-ref outputs "out")
+                                     "/src/golang.org/x/crypto/ed25519/testdata")
+                      ".*\\.gz$"))
+               #t)))))
+      (synopsis "TBD")
+      (description "TBD")
+      (home-page "https://go.googlesource.com/crypto/")
+      (license bsd-3))))
+
 (define* (go-golang-org-x-net-union #:optional
                                  (packages (list go-golang-org-x-net-ipv4
                                                  go-golang-org-x-net-bpf
-- 
2.16.3

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

On Mon, Apr 16, 2018 at 11:11:20AM +0200, Tomáš Čech wrote:
> * gnu/packages/syncthing.scm (go-golang-org-x-crypto-ssh-terminal): New
> variable.

Thanks!

In general, LGTM.

Did you put this in the Syncthing module because that's where the
rest of the Go 'x' libraries live? If so, I'd rather move the full 'x'
suite to (gnu packages golang), since they are not specific to Syncthing
and are used by nearly every Go application. I can handle this move.

> +      (synopsis "TBD")
> +      (description "TBD")

This is the last missing bit :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Tomáš Čech]

[-- Attachment #1: Type: text/plain, Size: 893 bytes --]

On Tue, Apr 17, 2018 at 03:52:14PM -0400, Leo Famulari wrote:
>On Mon, Apr 16, 2018 at 11:11:20AM +0200, Tomáš Čech wrote:
>> * gnu/packages/syncthing.scm (go-golang-org-x-crypto-ssh-terminal): New
>> variable.
>
>Thanks!
>
>In general, LGTM.
>
>Did you put this in the Syncthing module because that's where the
>rest of the Go 'x' libraries live? If so, I'd rather move the full 'x'
>suite to (gnu packages golang), since they are not specific to Syncthing
>and are used by nearly every Go application. I can handle this move.

Yes, my motivation was to keep all related packages together.

Moving go-golang* packages to (gnu packages golang) sounds right. I
will put it this to the same spot and let you do the rearrangement if
you don't mind.

>
>> +      (synopsis "TBD")
>> +      (description "TBD")
>
>This is the last missing bit :)

Ooops, sorry!

S_W

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]

On Tue, Apr 17, 2018 at 10:07:59PM +0200, Tomáš Čech wrote:
> On Tue, Apr 17, 2018 at 03:52:14PM -0400, Leo Famulari wrote:
> > On Mon, Apr 16, 2018 at 11:11:20AM +0200, Tomáš Čech wrote:
> > > * gnu/packages/syncthing.scm (go-golang-org-x-crypto-ssh-terminal): New
> > > variable.
> > 
> > Thanks!
> > 
> > In general, LGTM.
> > 
> > Did you put this in the Syncthing module because that's where the
> > rest of the Go 'x' libraries live? If so, I'd rather move the full 'x'
> > suite to (gnu packages golang), since they are not specific to Syncthing
> > and are used by nearly every Go application. I can handle this move.
> 
> Yes, my motivation was to keep all related packages together.
> 
> Moving go-golang* packages to (gnu packages golang) sounds right. I
> will put it this to the same spot and let you do the rearrangement if
> you don't mind.

Okay! Moved in 269d0858c6c01145b07be8ebb170e448894b112a

> > > +      (synopsis "TBD")
> > > +      (description "TBD")
> > 
> > This is the last missing bit :)
> 
> Ooops, sorry!

Can you fill these out and send an updated patch?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Tomáš Čech]

* gnu/packages/golang.scm (go-golang-org-x-crypto-ssh-terminal): New variable.
---
 gnu/packages/golang.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e2fbd54a5..485aa02c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
+;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1257,3 +1258,43 @@ functions for normalizing Unicode strings.")
 limiting in Go.")
       (home-page "https://godoc.org/golang.org/x/time/rate")
       (license license:bsd-3))))
+
+(define-public go-golang-org-x-crypto-ssh-terminal
+  (let ((commit "95a4943f35d008beabde8c11e5075a1b714e6419")
+        (revision "1"))
+    (package
+      (name "go-golang-org-x-crypto-ssh-terminal")
+      (version (git-version "0.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://go.googlesource.com/crypto")
+                      (commit commit)))
+                (file-name (string-append "go.googlesource.com-crypto-"
+                                          version "-checkout"))
+                (sha256
+                 (base32
+                  "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx"))))
+      (build-system go-build-system)
+      (inputs
+       `(("go-golang-org-x-sys-unix" ,go-golang-org-x-sys-unix)))
+      (arguments
+       `(#:import-path "golang.org/x/crypto/ssh/terminal"
+         #:unpack-path "golang.org/x/crypto"
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'reset-gzip-timestamps 'make-gzip-archive-writable
+             (lambda* (#:key outputs #:allow-other-keys)
+               (map (lambda (file)
+                      (make-file-writable file))
+                    (find-files
+                      (string-append (assoc-ref outputs "out")
+                                     "/src/golang.org/x/crypto/ed25519/testdata")
+                      ".*\\.gz$"))
+               #t)))))
+      (synopsis "Terminal functions for Go")
+      (description "This package provides @{terminal}, which implements
+support functions for dealing with terminals, as commonly found on UNIX
+systems.")
+      (home-page "https://go.googlesource.com/crypto/")
+      (license license:bsd-3))))
-- 
2.17.0

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

On Thu, Apr 19, 2018 at 10:05:55AM +0200, Tomáš Čech wrote:
> * gnu/packages/golang.scm (go-golang-org-x-crypto-ssh-terminal): New variable.

LGTM, thanks!

Also, please don't hesitate to suggest changes to the go-build-system.
The current implementation is a bit primitive and will probably need
some changes as we add more Go applications.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#31174] [PATCH] gnu: Add go-golang-org-x-crypto-ssh-terminal.

[Tomáš Čech]

[-- Attachment #1: Type: text/plain, Size: 42 bytes --]

Pushed. Closing.

Thanks for review!

S_W

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]