[bug#31881] [PATCH 1/4] gnu: Add go-github-com-sirupsen-logrus.

[bug#31881] [PATCH 1/4] gnu: Add go-github-com-sirupsen-logrus.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-sirupsen-logrus): New variable.
---
 gnu/packages/golang.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 6c21181da..3d1fc5b6d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1703,3 +1703,37 @@ incoming requests to their respective handler.")
        "Pflag is library to replace Go's flag package, implementing
 POSIX/GNU-style --flags.")
       (license license:bsd-3))))
+
+(define-public go-github-com-sirupsen-logrus
+  (let ((commit "4b6ea7319e214d98c938f12692336f7ca9348d6b")
+        (revision "0"))
+    (package
+      (name "go-github-com-sirupsen-logrus")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/sirupsen/logrus.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-golang-org-x-crypto-ssh-terminal"
+          ,go-golang-org-x-crypto-ssh-terminal)
+         ("go-github-com-stretchr-testify"
+          ,go-github-com-stretchr-testify)
+         ("go-golang-org-x-sys-unix"
+          ,go-golang-org-x-sys-unix)))
+      (arguments
+       '(#:tests? #f                    ;FIXME missing dependencies
+         #:import-path "github.com/sirupsen/logrus"))
+      (home-page "https://github.com/sirupsen/logrus")
+      (synopsis "This packages is structured, pluggable logging for Go")
+      (description
+       "Logrus is a structured logger for Go, completely API compatible with
+the standard library logger.")
+      (license license:expat))))
-- 
2.17.0

[bug#31881] [PATCH 2/4] gnu: Add go-github-com-kardianos-osext.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-kardianos-osext): New variable.
---
 gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3d1fc5b6d..5bda79dc9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1737,3 +1737,29 @@ POSIX/GNU-style --flags.")
        "Logrus is a structured logger for Go, completely API compatible with
 the standard library logger.")
       (license license:expat))))
+
+(define-public go-github-com-kardianos-osext
+  (let ((commit "c2c54e542fb797ad986b31721e1baedf214ca413")
+        (revision "0"))
+    (package
+      (name "go-github-com-kardianos-osext")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/kardianos/osext.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/kardianos/osext"))
+      (home-page
+       "https://github.com/kardianos/osext")
+      (synopsis "This package is an extensions to the standard os package")
+      (description
+       "Osext is an extensions to the standard os package for Golang.")
+      (license license:bsd-3))))
-- 
2.17.0

[bug#31881] [PATCH 3/4] gnu: Add go-github-com-ayufan-golang-kardianos-service.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-ayufan-golang-kardianos-service):
  New variable.
---
 gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5bda79dc9..f12c2b07a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1763,3 +1763,36 @@ the standard library logger.")
       (description
        "Osext is an extensions to the standard os package for Golang.")
       (license license:bsd-3))))
+
+(define-public go-github-com-ayufan-golang-kardianos-service
+  (let ((commit "0c8eb6d8fff2e2fb884a7bfd23e183fb63c0eff3")
+        (revision "0"))
+    (package
+      (name "go-github-com-ayufan-golang-kardianos-service")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url
+                "https://github.com/ayufan/golang-kardianos-service.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0x0cn7l5gda2khsfypix7adxd5yqighzn04mxjw6hc4ayrh7his5"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-github-com-kardianos-osext"
+          ,go-github-com-kardianos-osext)))
+      (arguments
+       '(#:tests? #f                ;FIXME tests fail: Service is not running.
+         #:import-path
+         "github.com/ayufan/golang-kardianos-service"))
+      (home-page
+       "https://github.com/ayufan/golang-kardianos-service")
+      (synopsis "This package is golang library to run program as a service")
+      (description
+       "Golang kardinos service is golang library to run go program as a
+service.")
+      (license license:zlib))))
-- 
2.17.0

[bug#31881] [PATCH 4/4] gnu: Add go-github-com-docker-distribution.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-docker-distribution): New variable.
---
 gnu/packages/golang.scm | 45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f12c2b07a..41d2e5ce1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1796,3 +1796,48 @@ the standard library logger.")
        "Golang kardinos service is golang library to run go program as a
 service.")
       (license license:zlib))))
+
+(define-public go-github-com-docker-distribution
+  (let ((commit "325b0804fef3a66309d962357aac3c2ce3f4d329")
+        (revision "0"))
+    (package
+      (name "go-github-com-docker-distribution")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/docker/distribution")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-golang-org-x-sys-unix"
+          ,go-golang-org-x-sys-unix)
+         ("go-github-com-sirupsen-logrus"
+          ,go-github-com-sirupsen-logrus)
+         ("go-golang-org-x-crypto-ssh-terminal"
+          ,go-golang-org-x-crypto-ssh-terminal)))
+      (arguments
+       '(#:import-path "github.com/docker/distribution"
+         #: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
+                     (assoc-ref outputs "out")
+                     ".*\\.gz$"))
+               #t)))))
+      (home-page
+       "https://github.com/docker/distribution")
+      (synopsis "This package is Docker toolset to pack, ship, store, and
+deliver content")
+      (description "Docker Distribution is Docker toolset to pack, ship,
+store, and deliver content.  It's containe Docker Registry 2.0 and libraries
+to interacting with distribution components.")
+      (license license:asl2.0))))
-- 
2.17.0

[bug#31881] [PATCH 1/4] gnu: Add go-github-com-sirupsen-logrus.

[Leo Famulari]

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

On Mon, Jun 18, 2018 at 05:15:43PM +0200, Rouby Pierre-Antoine wrote:
> * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): New variable.

Thank you for this patch series!

Currently, it doesn't apply to the Guix git master branch. Can you
rebase the patches on the master branch and send them again?

Thanks!

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

[bug#31881] [PATCH 1/4] gnu: Add go-github-com-sirupsen-logrus.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-sirupsen-logrus): New variable.
---
 gnu/packages/golang.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a83cdcde8..1dcf12d90 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1702,3 +1702,37 @@ with the
 @uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html,
 GNU extensions} to the POSIX recommendations for command-line options.")
       (license license:bsd-3))))
+
+(define-public go-github-com-sirupsen-logrus
+  (let ((commit "4b6ea7319e214d98c938f12692336f7ca9348d6b")
+        (revision "0"))
+    (package
+      (name "go-github-com-sirupsen-logrus")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/sirupsen/logrus.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-golang-org-x-crypto-ssh-terminal"
+          ,go-golang-org-x-crypto-ssh-terminal)
+         ("go-github-com-stretchr-testify"
+          ,go-github-com-stretchr-testify)
+         ("go-golang-org-x-sys-unix"
+          ,go-golang-org-x-sys-unix)))
+      (arguments
+       '(#:tests? #f                    ;FIXME missing dependencies
+         #:import-path "github.com/sirupsen/logrus"))
+      (home-page "https://github.com/sirupsen/logrus")
+      (synopsis "This packages is structured, pluggable logging for Go")
+      (description
+       "Logrus is a structured logger for Go, completely API compatible with
+the standard library logger.")
+      (license license:expat))))
-- 
2.17.0

[bug#31881] [PATCH 2/4] gnu: Add go-github-com-kardianos-osext.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-kardianos-osext): New variable.
---
 gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1dcf12d90..bef450eb6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1736,3 +1736,29 @@ GNU extensions} to the POSIX recommendations for command-line options.")
        "Logrus is a structured logger for Go, completely API compatible with
 the standard library logger.")
       (license license:expat))))
+
+(define-public go-github-com-kardianos-osext
+  (let ((commit "c2c54e542fb797ad986b31721e1baedf214ca413")
+        (revision "0"))
+    (package
+      (name "go-github-com-kardianos-osext")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/kardianos/osext.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/kardianos/osext"))
+      (home-page
+       "https://github.com/kardianos/osext")
+      (synopsis "This package is an extensions to the standard os package")
+      (description
+       "Osext is an extensions to the standard os package for Golang.")
+      (license license:bsd-3))))
-- 
2.17.0

[bug#31881] [PATCH 3/4] gnu: Add go-github-com-ayufan-golang-kardianos-service.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-ayufan-golang-kardianos-service):
  New variable.
---
 gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bef450eb6..be7b0d3f3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1762,3 +1762,36 @@ the standard library logger.")
       (description
        "Osext is an extensions to the standard os package for Golang.")
       (license license:bsd-3))))
+
+(define-public go-github-com-ayufan-golang-kardianos-service
+  (let ((commit "0c8eb6d8fff2e2fb884a7bfd23e183fb63c0eff3")
+        (revision "0"))
+    (package
+      (name "go-github-com-ayufan-golang-kardianos-service")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url
+                "https://github.com/ayufan/golang-kardianos-service.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0x0cn7l5gda2khsfypix7adxd5yqighzn04mxjw6hc4ayrh7his5"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-github-com-kardianos-osext"
+          ,go-github-com-kardianos-osext)))
+      (arguments
+       '(#:tests? #f                ;FIXME tests fail: Service is not running.
+         #:import-path
+         "github.com/ayufan/golang-kardianos-service"))
+      (home-page
+       "https://github.com/ayufan/golang-kardianos-service")
+      (synopsis "This package is golang library to run program as a service")
+      (description
+       "Golang kardinos service is golang library to run go program as a
+service.")
+      (license license:zlib))))
-- 
2.17.0

[bug#31881] [PATCH 4/4] gnu: Add go-github-com-docker-distribution.

[Rouby Pierre-Antoine]

* gnu/packages/golang.scm (go-github-com-docker-distribution): New variable.
---
 gnu/packages/golang.scm | 45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index be7b0d3f3..89476411b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1795,3 +1795,48 @@ the standard library logger.")
        "Golang kardinos service is golang library to run go program as a
 service.")
       (license license:zlib))))
+
+(define-public go-github-com-docker-distribution
+  (let ((commit "325b0804fef3a66309d962357aac3c2ce3f4d329")
+        (revision "0"))
+    (package
+      (name "go-github-com-docker-distribution")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/docker/distribution")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"))))
+      (build-system go-build-system)
+      (native-inputs
+       `(("go-golang-org-x-sys-unix"
+          ,go-golang-org-x-sys-unix)
+         ("go-github-com-sirupsen-logrus"
+          ,go-github-com-sirupsen-logrus)
+         ("go-golang-org-x-crypto-ssh-terminal"
+          ,go-golang-org-x-crypto-ssh-terminal)))
+      (arguments
+       '(#:import-path "github.com/docker/distribution"
+         #: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
+                     (assoc-ref outputs "out")
+                     ".*\\.gz$"))
+               #t)))))
+      (home-page
+       "https://github.com/docker/distribution")
+      (synopsis "This package is Docker toolset to pack, ship, store, and
+deliver content")
+      (description "Docker Distribution is Docker toolset to pack, ship,
+store, and deliver content.  It's containe Docker Registry 2.0 and libraries
+to interacting with distribution components.")
+      (license license:asl2.0))))
-- 
2.17.0

[bug#31881] [PATCH 1/4] gnu: Add go-github-com-sirupsen-logrus.

[Leo Famulari]

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

On Tue, Jun 19, 2018 at 10:43:30AM +0200, Rouby Pierre-Antoine wrote:
> * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): New variable.

Thanks! Pushed as 7427b2c6c1e5495d551375edf0c4177ab56179d7

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

[bug#31881] [PATCH 2/4] gnu: Add go-github-com-kardianos-osext.

[Leo Famulari]

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

On Tue, Jun 19, 2018 at 10:43:31AM +0200, Rouby Pierre-Antoine wrote:
> * gnu/packages/golang.scm (go-github-com-kardianos-osext): New variable.

We already have this package. I moved it from the Syncthing module to
the Golang module.

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

[bug#31881] [PATCH 3/4] gnu: Add go-github-com-ayufan-golang-kardianos-service.

[Leo Famulari]

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

On Tue, Jun 19, 2018 at 10:43:32AM +0200, Rouby Pierre-Antoine wrote:
> * gnu/packages/golang.scm (go-github-com-ayufan-golang-kardianos-service):
>   New variable.

Thanks! Pushed as aed4944d51669089620d8fe13b2e63c59e722b79.

By the way, this package is a fork of
<https://github.com/kardianos/service>, which has more recent
maintenance.

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

[bug#31881] [PATCH 4/4] gnu: Add go-github-com-docker-distribution.

[Leo Famulari]

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

On Tue, Jun 19, 2018 at 10:43:33AM +0200, Rouby Pierre-Antoine wrote:
> * gnu/packages/golang.scm (go-github-com-docker-distribution): New variable.

> +      (source
> +       (origin
> +         (method git-fetch)
> +         (uri (git-reference
> +               (url "https://github.com/docker/distribution")
> +               (commit commit)))

This bundles its entire dependency graph, including the logrus module
you just packaged, and some other things we have packaged:

https://github.com/docker/distribution/tree/master/vendor

I think it's okay to add the package with the bundled code if everything
is freely licensed. Can you confirm that it is?

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

[bug#31881] [PATCH 4/4] gnu: Add go-github-com-docker-distribution.

[Pierre-Antoine Rouby]

Hi Leo,

> From: "Leo Famulari" <leo@famulari.name>
>> +      (source
>> +       (origin
>> +         (method git-fetch)
>> +         (uri (git-reference
>> +               (url "https://github.com/docker/distribution")
>> +               (commit commit)))
>
> This bundles its entire dependency graph, including the logrus module
> you just packaged, and some other things we have packaged:

I'm not sure vendor version is the same as package version. I have the
impression some Go package have no tag or CHANGELOG, so I'm not sure for
compatibility. Without explicit version number I thinks is more sure to
use the vendor version.

> I think it's okay to add the package with the bundled code if everything
> is freely licensed. Can you confirm that it is?

Yes, everything is free.

bug#31881: [PATCH 4/4] gnu: Add go-github-com-docker-distribution.

[Ludovic Courtès]

Hello!

Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> skribis:

>> From: "Leo Famulari" <leo@famulari.name>
>>> +      (source
>>> +       (origin
>>> +         (method git-fetch)
>>> +         (uri (git-reference
>>> +               (url "https://github.com/docker/distribution")
>>> +               (commit commit)))
>>
>> This bundles its entire dependency graph, including the logrus module
>> you just packaged, and some other things we have packaged:
>
> I'm not sure vendor version is the same as package version. I have the
> impression some Go package have no tag or CHANGELOG, so I'm not sure for
> compatibility. Without explicit version number I thinks is more sure to
> use the vendor version.
>
>> I think it's okay to add the package with the bundled code if everything
>> is freely licensed. Can you confirm that it is?
>
> Yes, everything is free.

Based on this I went ahead and applied it, but I added a FIXME about
bundling.

P-A, could you look into unbundling at least those that are already
packaged?

Thank you!

Ludo’.