[bug#70684] [PATCH go-team 0/6] Update miniflux to 2.1.3

[bug#70684] [PATCH go-team 0/6] Update miniflux to 2.1.3

[Rodion Goritskov]

This patch series updates Miniflux to version 2.1.3. It also makes necessary changes
to dependencies: updates brotli library, as well as adds some new dependencies (hope I placed
them in correct files)

Rodion Goritskov (6):
  gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.
  gnu: Add go-github-com-google-go-tpm.
  gnu: Add go-github-com-x448-float16.
  gnu: Add go-github-com-abadojack-whatlanggo and
    go-github-com-fxamacker-cbor-v2.
  gnu: Add go-github-com-go-webauthn.
  gnu: miniflux: Update to 2.1.3.

 gnu/packages/golang-compression.scm |   4 +-
 gnu/packages/golang-crypto.scm      |  51 ++++++++++++
 gnu/packages/golang-web.scm         | 125 ++++++++++++++++++++++++++++
 gnu/packages/golang-xyz.scm         |  50 +++++++++++
 gnu/packages/golang.scm             |  25 ++++++
 gnu/packages/web.scm                |  97 ++++++++++-----------
 6 files changed, 303 insertions(+), 49 deletions(-)


base-commit: 8dab3df9529387ec1459d5483ac9664969c52e78
-- 
2.41.0

[bug#70684] [PATCH go-team 1/6] gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.

[Rodion Goritskov]

* gnu/packages/golang-compression.scm (go-github-com-andybalholm-brotli): Update to 1.1.0.

Change-Id: Iafa533051e69423bffdb9e9c4f7db4bda3c39964
---
 gnu/packages/golang-compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 568fdd12b9..25ba147e19 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -38,7 +38,7 @@ (define-module (gnu packages golang-compression)
 (define-public go-github-com-andybalholm-brotli
   (package
     (name "go-github-com-andybalholm-brotli")
-    (version "1.0.4")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -47,7 +47,7 @@ (define-public go-github-com-andybalholm-brotli
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+        (base32 "1zdvcwfzxnkljyh4p7izy0bfxrwidwwmp1p5h1fydyrgbs4xacly"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/andybalholm/brotli"))
-- 
2.41.0

[bug#70684] [PATCH go-team 2/6] gnu: Add go-github-com-google-go-tpm.

[Rodion Goritskov]

* gnu/packages/golang-crypto.scm (go-github-com-google-go-tpm-legacy-tpm2): New variable.
* gnu/packages/golang-crypto.scm (go-github-com-google-go-tpm-tpmutil): New variable.

Change-Id: Ib7b640dcb4ea6b87fca1d320f044315620f7e5f3
---
 gnu/packages/golang-crypto.scm | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 53ae308219..584755dc70 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -473,6 +473,57 @@ (define-public go-github-com-golang-jwt-jwt-v5
       #:go go-1.18
       #:import-path "github.com/golang-jwt/jwt/v5"))))
 
+(define-public go-github-com-google-go-tpm-legacy-tpm2
+  (package
+    (name "go-github-com-google-go-tpm-legacy-tpm2")
+    (version "0.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/go-tpm")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pv77fmlxrnxasj6fjvzrv9yaf2qb45x1zss3nbsdvzgpwviaiyi"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:unpack-path "github.com/google/go-tpm"
+      #:import-path "github.com/google/go-tpm/legacy/tpm2"))
+    (propagated-inputs (list go-golang-org-x-sys))
+    (home-page "https://github.com/google/go-tpm")
+    (synopsis "Go-TPM Legacy TPM 2.0 library")
+    (description
+     "Legacy TPM 2.0 library for directly communicating with a TPM device.")
+    (license license:asl2.0)))
+
+(define-public go-github-com-google-go-tpm-tpmutil
+  (package
+    (name "go-github-com-google-go-tpm-tpmutil")
+    (version "0.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/go-tpm")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pv77fmlxrnxasj6fjvzrv9yaf2qb45x1zss3nbsdvzgpwviaiyi"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:unpack-path "github.com/google/go-tpm"
+      #:import-path "github.com/google/go-tpm/tpmutil"))
+    (propagated-inputs (list go-golang-org-x-sys))
+    (home-page "https://github.com/google/go-tpm")
+    (synopsis "Go-TPM TPM util")
+    (description
+     "Useful utilities for a Go-TPM library
+that communicates directly with a TPM device.")
+    (license license:asl2.0)))
+
 (define-public go-github-com-gxed-hashland-keccakpg
   (let ((commit "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8")
         (revision "0"))
-- 
2.41.0

[bug#70684] [PATCH go-team 3/6] gnu: Add go-github-com-x448-float16.

[Rodion Goritskov]

* gnu/packages/golang.scm (go-github-com-x448-float16): New variable.

Change-Id: I02d8b8b6fea19f6a7b882cfa5d0165d7751f76bf
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4ce6f5ea6b..18ff264ecf 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2072,6 +2072,31 @@ (define-public go-github-com-flopp-go-findfont
 TrueType font files in your system's user and system font directories.")
     (license license:expat)))
 
+(define-public go-github-com-x448-float16
+  (package
+    (name "go-github-com-x448-float16")
+    (version "0.8.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/x448/float16")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qg6ya30fra20hpa2qzqqzs8l95lvw9yzd87fdzq195xqi6crb2l"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/x448/float16"))
+    (home-page "https://github.com/x448/float16")
+    (synopsis "Float16 (Binary16) in Go/Golang")
+    (description
+     "Package provides IEEE 754 half-precision floating-point format (binary16)
+with IEEE 754 default rounding for conversions.  IEEE 754-2008 refers to this
+16-bit floating-point format as binary16.")
+    (license license:expat)))
+
 (define-public go-github-com-phpdave11-gofpdi
   (package
     (name "go-github-com-phpdave11-gofpdi")
-- 
2.41.0

[bug#70684] [PATCH go-team 4/6] gnu: Add go-github-com-abadojack-whatlanggo and go-github-com-fxamacker-cbor-v2.

[Rodion Goritskov]

* gnu/packages/golang-xyz.scm (go-github-com-abadojack-whatlanggo): New variable.
* gnu/packages/golang-xyz.scm (go-github-com-fxamacker-cbor-v2): New variable.

Change-Id: I85c544262f01f274e54d70526b9dfc79af2a11c7
---
 gnu/packages/golang-xyz.scm | 50 +++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index f4ec142949..ef733ba3bc 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -81,6 +81,31 @@ (define-public go-github-com-a8m-envsubst
 substitution.")
     (license license:expat)))
 
+(define-public go-github-com-abadojack-whatlanggo
+  (package
+    (name "go-github-com-abadojack-whatlanggo")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/abadojack/whatlanggo")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pidd5dqvcnqjjka12h0clj3mmq0j3bpanf9153schsx85xz7mzx"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/abadojack/whatlanggo"))
+    (home-page "https://github.com/abadojack/whatlanggo")
+    (synopsis "Natural language detection library for Go")
+    (description
+     "Package detects natural languages and scripts (writing systems).
+Languages are represented by a determined list of constants
+while scripts are represented by RangeTable.")
+    (license license:expat)))
+
 (define-public go-github-com-alecthomas-chroma
   (package
     (name "go-github-com-alecthomas-chroma")
@@ -635,6 +660,31 @@ (define-public go-github-com-elliotchance-orderedmap
 for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.")
     (license license:expat)))
 
+(define-public go-github-com-fxamacker-cbor-v2
+  (package
+    (name "go-github-com-fxamacker-cbor-v2")
+    (version "2.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fxamacker/cbor")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "092g48d0mb7mv09x4qb3s899haliar8m7cvv77s5cqc5rncj6hzh"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/fxamacker/cbor/v2"))
+    (propagated-inputs (list go-github-com-x448-float16))
+    (home-page "https://github.com/fxamacker/cbor")
+    (synopsis "CBOR Codec in Go")
+    (description
+     "This is a Go library for encoding and decoding CBOR and CBOR Sequences,
+with CBOR tags, Go struct tags (toarray, keyasint, omitempty), float64/32/16, big.Int")
+    (license license:expat)))
+
 (define-public go-github-com-gabriel-vasile-mimetype
   (package
     (name "go-github-com-gabriel-vasile-mimetype")
-- 
2.41.0

[bug#70684] [PATCH go-team 5/6] gnu: Add go-github-com-go-webauthn.

[Rodion Goritskov]

* gnu/packages/golang-web.scm (go-github-com-go-webauthn-x): New variable.
* gnu/packages/golang-web.scm (go-github-com-go-webauthn-webauthn-protocol): New variable.
* gnu/packages/golang-web.scm (go-github-com-go-webauthn-webauthn-metadata): New variable
* gnu/packages/golang-web.scm (go-github-com-go-webauthn-webauthn-webauthn): New variable.

Change-Id: Ife3cb2d50e0481fafc207ca819711b85d50d0c13
---
 gnu/packages/golang-web.scm | 125 ++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 4f2c6f8c1a..500242ee98 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -964,6 +964,131 @@ (define-public go-github-com-gregjones-httpcache
 shared proxy).")
       (license license:expat))))
 
+(define-public go-github-com-go-webauthn-x
+  (package
+    (name "go-github-com-go-webauthn-x")
+    (version "0.1.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/x")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1lxxd2xhb5iappn4w49z5ahin4xfn3rj04vkdzzipyvwfzlix2al"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:unpack-path "github.com/go-webauthn/x"
+      #:import-path "github.com/go-webauthn/x/revoke"))
+    (propagated-inputs (list go-golang-org-x-crypto))
+    (home-page "https://github.com/go-webauthn/x")
+    (synopsis "Low level packages for Webauthn")
+    (description "Low level packages for Go Webauthn library.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-go-webauthn-webauthn-protocol
+  (package
+    (name "go-github-com-go-webauthn-webauthn-protocol")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/webauthn")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.18
+      ;; Tests are using external network address
+      #:tests? #f
+      #:unpack-path "github.com/go-webauthn/webauthn"
+      #:import-path "github.com/go-webauthn/webauthn/protocol"))
+    (native-inputs (list go-github-com-stretchr-testify))
+    (propagated-inputs (list go-golang-org-x-crypto
+                             go-github-com-mitchellh-mapstructure
+                             go-github-com-google-uuid
+                             go-github-com-google-go-tpm-tpmutil
+                             go-github-com-google-go-tpm-legacy-tpm2
+                             go-github-com-golang-jwt-jwt-v5
+                             go-github-com-go-webauthn-x
+                             go-github-com-fxamacker-cbor-v2))
+    (home-page "https://github.com/go-webauthn/webauthn")
+    (synopsis "WebAuthn Library")
+    (description
+     "This library is meant to handle @@url{https://www.w3.org/TR/webauthn,Web
+Authentication} for Go apps that wish to implement a passwordless solution for
+users.  This library conforms as much as possible to the guidelines and
+implementation procedures outlined by the document.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-go-webauthn-webauthn-metadata
+  (package
+    (inherit go-github-com-go-webauthn-webauthn-protocol)
+    (name "go-github-com-go-webauthn-webauthn-metadata")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/webauthn")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.18
+      ;; Tests are using external network address
+      #:tests? #f
+      #:unpack-path "github.com/go-webauthn/webauthn"
+      #:import-path "github.com/go-webauthn/webauthn/metadata"))
+    (propagated-inputs (list go-golang-org-x-crypto
+                             go-github-com-mitchellh-mapstructure
+                             go-github-com-google-uuid
+                             go-github-com-google-go-tpm-tpmutil
+                             go-github-com-google-go-tpm-legacy-tpm2
+                             go-github-com-golang-jwt-jwt-v5
+                             go-github-com-go-webauthn-x
+                             go-github-com-fxamacker-cbor-v2))
+    (native-inputs (list go-github-com-stretchr-testify))))
+
+(define-public go-github-com-go-webauthn-webauthn-webauthn
+  (package
+    (inherit go-github-com-go-webauthn-webauthn-protocol)
+    (name "go-github-com-go-webauthn-webauthn-webauthn")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/webauthn")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.18
+      #:unpack-path "github.com/go-webauthn/webauthn"
+      #:import-path "github.com/go-webauthn/webauthn/webauthn"))
+    (propagated-inputs (list go-golang-org-x-crypto
+                             go-github-com-mitchellh-mapstructure
+                             go-github-com-google-uuid
+                             go-github-com-google-go-tpm-tpmutil
+                             go-github-com-google-go-tpm-legacy-tpm2
+                             go-github-com-golang-jwt-jwt-v5
+                             go-github-com-go-webauthn-x
+                             go-github-com-fxamacker-cbor-v2))
+    (native-inputs (list go-github-com-stretchr-testify))))
+
 (define-public go-github-com-hjson-hjson-go
   (package
     (name "go-github-com-hjson-hjson-go")
-- 
2.41.0

[bug#70684] [PATCH go-team 6/6] gnu: miniflux: Update to 2.1.3.

[Rodion Goritskov]

* gnu/packages/web.scm (miniflux): Update to 2.1.3.

Change-Id: I51a93f290b6a625a2c1db9959871396c0f67f5e5
---
 gnu/packages/web.scm | 97 +++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d729e9bdbf..1c97dc389c 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -145,6 +145,7 @@ (define-module (gnu packages web)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gperf)
@@ -335,56 +336,57 @@ (define-public httpd/pinned
 (define-public miniflux
   (package
     (name "miniflux")
-    (version "2.0.46")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/miniflux/v2")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb"))))
+    (version "2.1.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/miniflux/v2")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cb0fkjzbjrhgmx1s8jv1drdgfaddkyj9j9z451qswgvz6xyp3a3"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.19
-           #:install-source? #f
-           #:import-path "miniflux.app"
-           #:build-flags
-           #~(list (string-append
-                    "-ldflags= -X miniflux.app/version.Version=" #$version))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'build 'disable-cgo
-                 (lambda _
-                   (setenv "CGO_ENABLED" "0")))
-               (add-after 'install 'install-manpage
-                 (lambda* (#:key import-path #:allow-other-keys)
-                   (let ((man1 (string-append #$output "/share/man/man1/"))
-                         (page (format #f "src/~a/miniflux.1" import-path)))
-                     (install-file page man1))))
-               (add-after 'install-manpage 'rename-binary
-                 (lambda _
-                   (let ((bindir (string-append #$output "/bin/")))
-                     (rename-file (string-append bindir "miniflux.app")
-                                  (string-append bindir "miniflux"))))))))
-    (inputs
-     (list go-github-com-coreos-go-oidc-v3
-           go-github-com-go-telegram-bot-api-telegram-bot-api
-           go-github-com-gorilla-mux
-           go-github-com-lib-pq
-           go-github-com-matrix-org-gomatrix
-           go-github-com-prometheus-client-golang
-           go-github-com-puerkitobio-goquery
-           go-github-com-rylans-getlang
-           go-github-com-tdewolff-minify-v2
-           go-github-com-yuin-goldmark
-           go-golang-org-x-term
-           go-mvdan-cc-xurls))
+     (list
+      #:go go-1.22
+      #:install-source? #f
+      #:import-path "miniflux.app/v2"
+      #:build-flags #~(list (string-append
+                             "-ldflags= -X miniflux.app/v2/internal/version.Version="
+                             #$version))
+      #:phases #~(modify-phases %standard-phases
+		   ;; Scans for all tests recursively
+		   (replace 'check
+			    (lambda* (#:key import-path #:allow-other-keys)
+			      (invoke "go" "test" (string-append import-path "/..."))))
+                   (add-after 'install 'install-manpage
+                     (lambda* (#:key import-path #:allow-other-keys)
+                       (let ((man1 (string-append #$output "/share/man/man1/"))
+                             (page (format #f "src/~a/miniflux.1" import-path)))
+                         (install-file page man1))))
+                   (add-after 'install-manpage 'rename-binary
+                     (lambda _
+                       (let ((bindir (string-append #$output "/bin/")))
+                         (rename-file (string-append bindir "v2")
+                                      (string-append bindir "miniflux"))))))))
+    (inputs (list go-github-com-go-webauthn-webauthn-webauthn
+                  go-github-com-go-webauthn-webauthn-protocol
+                  go-github-com-go-webauthn-webauthn-metadata
+		  go-github-com-andybalholm-brotli
+                  go-github-com-abadojack-whatlanggo
+                  go-github-com-coreos-go-oidc-v3
+                  go-github-com-gorilla-mux
+                  go-github-com-lib-pq
+                  go-github-com-prometheus-client-golang
+                  go-github-com-puerkitobio-goquery
+                  go-github-com-tdewolff-minify-v2
+                  go-github-com-yuin-goldmark
+                  go-golang-org-x-term
+                  go-mvdan-cc-xurls))
     (home-page "https://miniflux.app/")
     (synopsis "Minimalist and opinionated feed reader")
-    (description
-     "Miniflux is a minimalist and opinionated feed reader:
+    (description "Miniflux is a minimalist and opinionated feed reader:
 
 @itemize
 @item Written in Go (Golang)
@@ -394,7 +396,8 @@ (define-public miniflux
 @item Use only modern vanilla Javascript (ES6 and Fetch API)
 @item Single binary compiled statically without dependency
 @item The number of features is voluntarily limited
-@end itemize\n")
+@end itemize
+")
     (license license:asl2.0)))
 
 (define-public mod-wsgi
-- 
2.41.0

[bug#70684] [PATCH go-team 0/6] Update miniflux to 2.1.3

[Sharlatan Hellseher]

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


Hi!

Thanks for the patches.

After a quick review I've got some suggestions to process further in
more details.

In general the <#:import-path> is what we may see on go.mod after
<module>. In general <#:unpack-path> is not required to build golang
module.

According to the <https://github.com/google/go-tpm/blob/v0.9.0/go.mod>
these two packages may be packed as single one:
<module github.com/google/go-tpm>.
--8<---------------cut here---------------start------------->8---
+(define-public go-github-com-google-go-tpm-legacy-tpm2
+(define-public go-github-com-google-go-tpm-tpmutil
--8<---------------cut here---------------end--------------->8---

These need to be presented as dedicated patches per each package.

* [PATCH go-team 4/6] gnu: Add go-github-com-abadojack-whatlanggo and
  go-github-com-fxamacker-cbor-v2.
* [PATCH go-team 5/6] gnu: Add go-github-com-go-webauthn.

Fix import path according to go.mod <https://github.com/go-webauthn/x/blob/master/go.mod>
<module github.com/go-webauthn/x>
--8<---------------cut here---------------start------------->8---
+(define-public go-github-com-go-webauthn-x
--8<---------------cut here---------------end--------------->8---

This is one go-module no need to split it into 3 packages, see go.mod
<https://github.com/go-webauthn/webauthn/blob/v0.10.2/go.mod>
<module github.com/go-webauthn/webauthn>
--8<---------------cut here---------------start------------->8---
+(define-public go-github-com-go-webauthn-webauthn-protocol
+(define-public go-github-com-go-webauthn-webauthn-metadata
+(define-public go-github-com-go-webauthn-webauthn-webauthn
--8<---------------cut here---------------end--------------->8---

* [PATCH go-team 6/6] gnu: miniflux: Update to 2.1.3.
- fix indentation
- try to build with go-1.21 (available in master) as go-team is not
  setup with CI yet and may block propagating to master
- list all of modification in commit message or split each not related
  modification into patch


Looking forward for the v2!

--
Oleg

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

[bug#70684] [PATCH go-team 0/6] Update miniflux to 2.1.3

[Rodion Goritskov]

Hi, thank you for review!

> In general the <#:import-path> is what we may see on go.mod after
> <module>. In general <#:unpack-path> is not required to build golang
> module.
>
> According to the <https://github.com/google/go-tpm/blob/v0.9.0/go.mod>
> these two packages may be packed as single one:
> <module github.com/google/go-tpm>.
>
> +(define-public go-github-com-google-go-tpm-legacy-tpm2
> +(define-public go-github-com-google-go-tpm-tpmutil

I have a problem when trying to build these packages as one.
When trying to build the single package (like this):

(define go-github-com-google-go-tpm
  (package
    (name "go-github-com-google-go-tpm")
    (version "0.9.0")
    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/google/go-tpm")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32 "1pv77fmlxrnxasj6fjvzrv9yaf2qb45x1zss3nbsdvzgpwviaiyi"))))
    (build-system go-build-system)
    (arguments
     (list
      #:go go-1.22
      #:import-path "github.com/google/go-tpm"))
    (propagated-inputs (list go-golang-org-x-sys
                             go-golang-org-x-crypto))
    (home-page "https://github.com/google/go-tpm")
    (synopsis "Go-TPM library")
    (description
     "TPM 2.0 library for directly communicating with a TPM device.")
    (license license:asl2.0)))

I get the following error on the "build" phase:

command "go" "install" "-v" "-x" "-ldflags=-s -w" "-trimpath"
"github.com/google/go-tpm" failed with status 1

Actually, it fails with the following go install error (found by running
guix build with -K and running command manually in the build folder):

package github.com/google/go-tpm: no Go files in
/tmp/guix-build-go-github-com-google-go-tpm-0.9.0.drv-0/src/github.com/google/go-tpm

This is true - there are no *.go files in the project's root.
For this project to build succesfully, project directory for "go
install" should end with /... (to build all subfolders recursively), like:

"go" "install" "-v" "-x" "-ldflags=-s -w" "-trimpath"
"github.com/google/go-tpm/..."

So, for now I could remove the build (and check, because it has the same
problem) phases from the build (easy, but, AFAIK, not the best fix). In
this case we still have all the necessary sources, for dependent
packages, but no checks.

Or, maybe, we could add some kind of "recursive" flag to the
go-build-system. In this case, as I see, it will lead to all go packages rebuild
(even if it will not be enabled by default).

What do you think?

> This is one go-module no need to split it into 3 packages, see go.mod
> <https://github.com/go-webauthn/webauthn/blob/v0.10.2/go.mod>
> <module github.com/go-webauthn/webauthn>
>
> +(define-public go-github-com-go-webauthn-webauthn-protocol
> +(define-public go-github-com-go-webauthn-webauthn-metadata
> +(define-public go-github-com-go-webauthn-webauthn-webauthn

For these package I have the same problem (no go files in the root folder).

[bug#70684] [PATCH v2 0/9] Update miniflux to 2.1.3

[Sharlatan Hellseher]

Hi,

I've modified the series and re-created some patches to provide dedicated
commits per change types. Some of the packages merged togather to produce one
logical Golang module as seen in go.mod.

Modifications applied:

- patches [6/6]
  - [X] [PATCH go-team 1/6] gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.
  - [X] [PATCH go-team 2/6] gnu: Add go-github-com-google-go-tpm.
    - Merge go-github-com-google-go-tpm-legacy-tpm2 and go-github-com-google-go-tpm-tpmutil into
      go-github-com-google-go-tpm
    - Update description
    - Update to 0.9.1
    - Build with go-1.22
    - Delete build and check phases, to break the cycle
  - [X] [PATCH go-team 3/6] gnu: Add go-github-com-x448-float16.
    - Place in golang-maths
  - [X] [PATCH go-team 4/6] gnu: Add go-github-com-abadojack-whatlanggo and go-github-com-fxamacker-cbor-v2.
    - Split into to patches and commit them separately
  - [X] [PATCH go-team 5/6] gnu: Add go-github-com-go-webauthn.
    - Split into 3x patches and commit them separately
    - Adjust license list
    - Adjust check phases
  - [X] [PATCH go-team 6/6] gnu: miniflux: Update to 2.1.3.
    - Keep indentation and fix it separately
    - Adjust commit message to cover all changes
    - Include all packages listed in go.mod

Submitting v2 to check with QA, while the series has pass built and lint locally:

--8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix build go-github-com-andybalholm-brotli
  go-github-com-google-go-tpm go-github-com-x448-float16
  go-github-com-abadojack-whatlanggo go-github-com-fxamacker-cbor-v2
  go-github-com-go-webauthn-x go-github-com-go-webauthn-webauthn miniflux

/gnu/store/7k42f5q58xjix6jaar8wd95brs3m4vgf-miniflux-2.1.3
/gnu/store/xz74rvq3g0bjzj756wwrmnyr466ly93w-go-github-com-go-webauthn-webauthn-0.10.2
/gnu/store/dd0x6a4xdcq9f2xmmszc2mscbh9pa1dk-go-github-com-go-webauthn-x-0.1.11
/gnu/store/w827vdkxzmgkg95l51gqfrqalqr8j9yf-go-github-com-fxamacker-cbor-v2-2.7.0
/gnu/store/hhvhzfp9ynz05akmsgyjiw05gkrddssh-go-github-com-abadojack-whatlanggo-1.0.1
/gnu/store/j32azqajjywjhj8v9xzs4za00az9f76m-go-github-com-x448-float16-0.8.4
/gnu/store/4as8j152chcnq65rvs0mc5w4vmz1q0bk-go-github-com-google-go-tpm-0.9.1
/gnu/store/wbw8bck4rfncpginvzv55xdi6ban5wxm-go-github-com-andybalholm-brotli-1.1.0
--8<---------------cut here---------------end--------------->8---

The dependent list includes heavy to build packages, letting QA to digest them
first:
--8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix refresh --list-dependent
  go-github-com-andybalholm-brotli go-github-com-google-go-tpm
  go-github-com-x448-float16 go-github-com-abadojack-whatlanggo
  go-github-com-fxamacker-cbor-v2 go-github-com-go-webauthn-x
  go-github-com-go-webauthn-webauthn miniflux

Building the following 4 packages would ensure 8 dependent packages are
rebuilt: mullvadbrowser@13.0.16 torbrowser@13.0.16
go-github-com-valyala-fasthttp@1.39.0 miniflux@2.1.3
--8<---------------cut here---------------end--------------->8---

Rodion Goritskov (8):
  gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.
  gnu: Add go-github-com-google-go-tpm.
  gnu: Add go-github-com-x448-float16.
  gnu: Add go-github-com-abadojack-whatlanggo.
  gnu: Add go-github-com-fxamacker-cbor-v2.
  gnu: Add go-github-com-go-webauthn-x.
  gnu: Add go-github-com-go-webauthn-webauthn.
  gnu: miniflux: Update to 2.1.3.

Sharlatan Hellseher (1):
  gnu: miniflux: Adjust indentation.

 gnu/packages/golang-compression.scm |   4 +-
 gnu/packages/golang-crypto.scm      |  41 +++++++++++
 gnu/packages/golang-maths.scm       |  28 ++++++++
 gnu/packages/golang-web.scm         | 108 ++++++++++++++++++++++++++++
 gnu/packages/golang-xyz.scm         |  54 ++++++++++++++
 gnu/packages/web.scm                |  76 ++++++++++----------
 6 files changed, 273 insertions(+), 38 deletions(-)


base-commit: ddbbb78786e104a9a9e93cffe9f69b6c0f3bd4ed
-- 
2.41.0

[bug#70684] [PATCH v2 1/9] gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-compression.scm (go-github-com-andybalholm-brotli): Update to 1.1.0.

Change-Id: Iafa533051e69423bffdb9e9c4f7db4bda3c39964
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang-compression.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm
index 67ae28abe5..a6c0410051 100644
--- a/gnu/packages/golang-compression.scm
+++ b/gnu/packages/golang-compression.scm
@@ -40,7 +40,7 @@ (define-module (gnu packages golang-compression)
 (define-public go-github-com-andybalholm-brotli
   (package
     (name "go-github-com-andybalholm-brotli")
-    (version "1.0.4")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -49,7 +49,7 @@ (define-public go-github-com-andybalholm-brotli
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0"))))
+        (base32 "1zdvcwfzxnkljyh4p7izy0bfxrwidwwmp1p5h1fydyrgbs4xacly"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/andybalholm/brotli"))
-- 
2.41.0

[bug#70684] [PATCH v2 2/9] gnu: Add go-github-com-google-go-tpm.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-crypto.scm (go-github-com-google-go-tpm-legacy-tpm2): New variable.
* gnu/packages/golang-crypto.scm (go-github-com-google-go-tpm-tpmutil): New variable.

Change-Id: Ib7b640dcb4ea6b87fca1d320f044315620f7e5f3
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang-crypto.scm | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index ddeb79badf..5dbc9a6ae4 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -578,6 +578,47 @@ (define-public go-github-com-golang-jwt-jwt-v5
       #:go go-1.18
       #:import-path "github.com/golang-jwt/jwt/v5"))))
 
+(define-public go-github-com-google-go-tpm
+  (package
+    (name "go-github-com-google-go-tpm")
+    (version "0.9.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/google/go-tpm")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1c5j5cvwl45ka93nknmv454ivd7kp9n8yql19gr6z01z0s1ph7sg"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:import-path "github.com/google/go-tpm"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Break cycle:
+          ;; github.com/google/go-tpm/tpm2/transport/simulator/simulator.go ->
+          ;; github.com/google/go-tpm-tools -> github.com/google/go-tpm.
+          ;; Consider to add required inputs on dependent package.
+          (delete 'build)
+          (delete 'check))))
+    (home-page "https://github.com/google/go-tpm")
+    (synopsis "Go-TPM Legacy TPM 2.0 library")
+    (description
+     "Go-TPM is a Go library that communicates directly with a
+@acronym{Trusted Platform Module, TPM} device.  The libraries don't implement
+the entire spec for neither 1.2 nor 2.0.  This package provides following
+submodules:
+@itemize
+@item @code{tpm} - TPM 1.2 client library
+@item @code{tpm2} - TPM 2.0 client library.
+@item @code{direct} - the prototype \"TPMDirect\" TPM 2.0 API, which is
+intended to (eventually) be 1:1 with the TPM 2.0 spec
+@end itemize")
+    (license license:asl2.0)))
+
 ;; It's not public for purpose, as it contains a lot of golang modules which
 ;; may be inherited from the single source, but the package itself does not
 ;; have to be installed directly or linked to other packages..
-- 
2.41.0

[bug#70684] [PATCH v2 3/9] gnu: Add go-github-com-x448-float16.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang.scm (go-github-com-x448-float16): New variable.

Change-Id: I02d8b8b6fea19f6a7b882cfa5d0165d7751f76bf
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/golang-maths.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/golang-maths.scm b/gnu/packages/golang-maths.scm
index 2348255119..9516f43573 100644
--- a/gnu/packages/golang-maths.scm
+++ b/gnu/packages/golang-maths.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Rodion Goritskov <rodion.goritskov@gmail.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -88,6 +89,33 @@ (define-public go-github-com-shopspring-decimal
 @end itemize")
     (license license:expat)))
 
+(define-public go-github-com-x448-float16
+  (package
+    (name "go-github-com-x448-float16")
+    (version "0.8.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/x448/float16")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qg6ya30fra20hpa2qzqqzs8l95lvw9yzd87fdzq195xqi6crb2l"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/x448/float16"))
+    (home-page "https://github.com/x448/float16")
+    (synopsis "Float16 (Binary16) in Go/Golang")
+    (description
+     "Package provides
+@url{https://en.wikipedia.org/wiki/Half-precision_floating-point_format,IEEE
+754 half-precision floating-point format (binary16)} with IEEE 754 default
+rounding for conversions.  IEEE 754-2008 refers to this 16-bit floating-point
+format as binary16.")
+    (license license:expat)))
+
 ;;;
 ;;; Executables:
 ;;;
-- 
2.41.0

[bug#70684] [PATCH v2 4/9] gnu: Add go-github-com-abadojack-whatlanggo.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-xyz.scm (go-github-com-abadojack-whatlanggo): New variable.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: I49a0d5c9d97ba9eb1279b75f5177966e800a2475
---
 gnu/packages/golang-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 54b9c45ed6..d63c184bf6 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -373,6 +373,31 @@ (define-public go-github-com-a8m-envsubst
 substitution.")
     (license license:expat)))
 
+(define-public go-github-com-abadojack-whatlanggo
+  (package
+    (name "go-github-com-abadojack-whatlanggo")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/abadojack/whatlanggo")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pidd5dqvcnqjjka12h0clj3mmq0j3bpanf9153schsx85xz7mzx"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/abadojack/whatlanggo"))
+    (home-page "https://github.com/abadojack/whatlanggo")
+    (synopsis "Natural language detection library for Go")
+    (description
+     "Package detects natural languages and scripts (writing systems).
+Languages are represented by a determined list of constants while scripts are
+represented by RangeTable.")
+    (license license:expat)))
+
 (define-public go-github-com-adrg-strutil
   (package
     (name "go-github-com-adrg-strutil")
-- 
2.41.0

[bug#70684] [PATCH v2 5/9] gnu: Add go-github-com-fxamacker-cbor-v2.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-xyz.scm (go-github-com-fxamacker-cbor-v2): New variable.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: I19e13404586613fd4629c35f50264120df264c6b
---
 gnu/packages/golang-xyz.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index d63c184bf6..e7811766df 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1775,6 +1775,35 @@ (define-public go-github-com-flynn-archive-go-shlex
       (home-page "https://github.com/flynn-archive/go-shlex")
       (license license:asl2.0))))
 
+(define-public go-github-com-fxamacker-cbor-v2
+  (package
+    (name "go-github-com-fxamacker-cbor-v2")
+    (version "2.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/fxamacker/cbor")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "039lk7n5155gy2sh55i1darcvxhv9fim2xmnvmx0xi9ihnrnczln"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/fxamacker/cbor/v2"))
+    (propagated-inputs
+     (list go-github-com-x448-float16))
+    (home-page "https://github.com/fxamacker/cbor")
+    (synopsis "CBOR Codec in Go")
+    (description
+     "This package implement functionality for encoding and decoding
+@acronym{Concise Binary Object Representation,CBOR}
+(@url{https://www.rfc-editor.org/rfc/rfc8949.html,RFC 8949}) and CBOR
+Sequences,with CBOR tags, Go struct tags (toarray, keyasint, omitempty),
+float64/32/16, big.Int.")
+    (license license:expat)))
+
 (define-public go-github-com-gabriel-vasile-mimetype
   (package
     (name "go-github-com-gabriel-vasile-mimetype")
-- 
2.41.0

[bug#70684] [PATCH v2 6/9] gnu: Add go-github-com-go-webauthn-x.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-web.scm (go-github-com-go-webauthn-x): New variable.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: Ia7ebf7cfc9c9e588e9ee968603a5c6ea5237d75d
---
 gnu/packages/golang-web.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e64f20801c..bd7d88be6d 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2848,6 +2848,42 @@ (define-public go-github-com-valyala-fasthttp
 replacement for native @code{net/http} module.")
     (license license:expat)))
 
+(define-public go-github-com-go-webauthn-x
+  (package
+    (name "go-github-com-go-webauthn-x")
+    (version "0.1.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/x")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "020pc8q218q8217c9i346vbing26qpnkidhpjvm5501wq6qm0zak"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:tests? #f ; no tests
+      #:import-path "github.com/go-webauthn/x"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; Source only package.
+          (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-crypto))
+    (home-page "https://github.com/go-webauthn/x")
+    (synopsis "Low level packages for WebAuthn")
+    (description
+     "This package implements a low level functionality for
+@url{https://github.com/go-webauthn/webauthn,WebAuthn} library.  It was forked
+from CloudFlare's github.com/cloudflare/cfssl/revoke.")
+    (license (list
+              ;; For the CloudFlare's part: revoke/LICENSE.
+              license:bsd-2
+              ;; For the WebAuthn's fork: LICENSE.
+              license:bsd-3))))
+
 (define-public go-github-com-whyrusleeping-json-filter
   (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b")
         (revision "0"))
-- 
2.41.0

[bug#70684] [PATCH v2 7/9] gnu: Add go-github-com-go-webauthn-webauthn.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/golang-web.scm (go-github-com-go-webauthn-webauthn): New variable.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: I990f088c5d3b8dd360f26e953e6d2c0d01f1c808
---
 gnu/packages/golang-web.scm | 72 +++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index bd7d88be6d..588fa4b681 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2848,6 +2848,78 @@ (define-public go-github-com-valyala-fasthttp
 replacement for native @code{net/http} module.")
     (license license:expat)))
 
+(define-public go-github-com-go-webauthn-webauthn
+  (package
+    (name "go-github-com-go-webauthn-webauthn")
+    (version "0.10.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-webauthn/webauthn")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.22
+      #:import-path "github.com/go-webauthn/webauthn"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-failing-tests
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          (list
+                           ;; It tryes to access outbound network:
+                           ;;
+                           ;; Get "https://mds.fidoalliance.org": dial tcp:
+                           ;; lookup mds.fidoalliance.org on [::1]:53: read udp
+                           ;; [::1]:52300->[::1]:53: read: connection refused
+                           ;;
+                           ;; Post "https://mds3.fido.tools/getEndpoints": dial
+                           ;; tcp: lookup mds3.fido.tools on [::1]:53: read udp
+                           ;; [::1]:46703->[::1]:53: read: connection refused
+                           "metadata/metadata_test.go"
+                           ;; Get "https://mds.fidoalliance.org": dial tcp:
+                           ;; lookup mds.fidoalliance.org on [::1]:53: read udp
+                           ;; [::1]:37459->[::1]:53: read: connection refused
+                           "protocol/attestation_androidkey_test.go"
+                           "protocol/attestation_apple_test.go"
+                           "protocol/attestation_packed_test.go"
+                           "protocol/attestation_safetynet_test.go"
+                           "protocol/attestation_test.go"
+                           "protocol/attestation_tpm_test.go"
+                           "protocol/attestation_u2f_test.go")))))
+          ;; XXX: Run all tests, workaround for go-build-system's lack of Go
+          ;; modules support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-fxamacker-cbor-v2
+           go-github-com-go-webauthn-x
+           go-github-com-golang-jwt-jwt-v5
+           go-github-com-google-go-tpm
+           go-github-com-google-uuid
+           go-github-com-mitchellh-mapstructure))
+    (home-page "https://github.com/go-webauthn/webauthn")
+    (synopsis "Webauthn/FIDO2 library for Golang")
+    (description
+     "This library is meant to handle @url{https://www.w3.org/TR/webauthn,Web
+Authentication} for Go apps that wish to implement a passwordless solution for
+users.  This library conforms as much as possible to the guidelines and
+implementation procedures outlined by the document.  It's a successor of not
+maintained https://github.com/duo-labs/webauthn library.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-go-webauthn-x
   (package
     (name "go-github-com-go-webauthn-x")
-- 
2.41.0

[bug#70684] [PATCH v2 8/9] gnu: miniflux: Update to 2.1.3.

[Sharlatan Hellseher]

From: Rodion Goritskov <rodion.goritskov@gmail.com>

* gnu/packages/web.scm (miniflux): Update to 2.1.3.
[arguments]: <#:go>: Use go-1.22. <#:import-path>: Reflect present
go.mod. <#:build-flags>: Likewise. <#:phases>: Delete phase
'disable-cgo.
[inputs]: Remove go-github-com-go-telegram-bot-api-telegram-bot-api,
go-github-com-matrix-org-gomatrix and go-github-com-rylans-getlang. Add
go-github-com-abadojack-whatlanggo, go-github-com-andybalholm-brotli,
go-github-com-go-webauthn-webauthn go-golang-org-x-crypto,
go-golang-org-x-net, go-golang-org-x-oauth2, and go-golang-org-x-text.

Change-Id: I51a93f290b6a625a2c1db9959871396c0f67f5e5
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/web.scm | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 90f7330f2b..d6eb508e9b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -148,6 +148,7 @@ (define-module (gnu packages web)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-check)
+  #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gperf)
@@ -338,7 +339,7 @@ (define-public httpd/pinned
 (define-public miniflux
   (package
     (name "miniflux")
-    (version "2.0.46")
+    (version "2.1.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -347,20 +348,18 @@ (define-public miniflux
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb"))))
+                "0cb0fkjzbjrhgmx1s8jv1drdgfaddkyj9j9z451qswgvz6xyp3a3"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.19
+     (list #:go go-1.22
            #:install-source? #f
-           #:import-path "miniflux.app"
+           #:import-path "miniflux.app/v2"
            #:build-flags
            #~(list (string-append
-                    "-ldflags= -X miniflux.app/version.Version=" #$version))
+                    "-ldflags= -X miniflux.app/v2/internal/version.Version="
+                    #$version))
            #:phases
            #~(modify-phases %standard-phases
-               (add-before 'build 'disable-cgo
-                 (lambda _
-                   (setenv "CGO_ENABLED" "0")))
                (add-after 'install 'install-manpage
                  (lambda* (#:key import-path #:allow-other-keys)
                    (let ((man1 (string-append #$output "/share/man/man1/"))
@@ -369,20 +368,24 @@ (define-public miniflux
                (add-after 'install-manpage 'rename-binary
                  (lambda _
                    (let ((bindir (string-append #$output "/bin/")))
-                     (rename-file (string-append bindir "miniflux.app")
+                     (rename-file (string-append bindir "v2")
                                   (string-append bindir "miniflux"))))))))
     (inputs
-     (list go-github-com-coreos-go-oidc-v3
-           go-github-com-go-telegram-bot-api-telegram-bot-api
+     (list go-github-com-abadojack-whatlanggo
+           go-github-com-andybalholm-brotli
+           go-github-com-coreos-go-oidc-v3
+           go-github-com-go-webauthn-webauthn
            go-github-com-gorilla-mux
            go-github-com-lib-pq
-           go-github-com-matrix-org-gomatrix
            go-github-com-prometheus-client-golang
            go-github-com-puerkitobio-goquery
-           go-github-com-rylans-getlang
            go-github-com-tdewolff-minify-v2
            go-github-com-yuin-goldmark
+           go-golang-org-x-crypto
+           go-golang-org-x-net
+           go-golang-org-x-oauth2
            go-golang-org-x-term
+           go-golang-org-x-text
            go-mvdan-cc-xurls))
     (home-page "https://miniflux.app/")
     (synopsis "Minimalist and opinionated feed reader")
-- 
2.41.0

[bug#70684] [PATCH v2 9/9] gnu: miniflux: Adjust indentation.

[Sharlatan Hellseher]

gnu/packages/web.scm (miniflux): Adjust indentation.

Change-Id: I452511b80d56ec647691690d801839ab18049b33
---
 gnu/packages/web.scm | 59 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d6eb508e9b..4ef6aae6b8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -340,36 +340,37 @@ (define-public miniflux
   (package
     (name "miniflux")
     (version "2.1.3")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/miniflux/v2")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0cb0fkjzbjrhgmx1s8jv1drdgfaddkyj9j9z451qswgvz6xyp3a3"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/miniflux/v2")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cb0fkjzbjrhgmx1s8jv1drdgfaddkyj9j9z451qswgvz6xyp3a3"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.22
-           #:install-source? #f
-           #:import-path "miniflux.app/v2"
-           #:build-flags
-           #~(list (string-append
-                    "-ldflags= -X miniflux.app/v2/internal/version.Version="
-                    #$version))
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'install 'install-manpage
-                 (lambda* (#:key import-path #:allow-other-keys)
-                   (let ((man1 (string-append #$output "/share/man/man1/"))
-                         (page (format #f "src/~a/miniflux.1" import-path)))
-                     (install-file page man1))))
-               (add-after 'install-manpage 'rename-binary
-                 (lambda _
-                   (let ((bindir (string-append #$output "/bin/")))
-                     (rename-file (string-append bindir "v2")
-                                  (string-append bindir "miniflux"))))))))
+     (list
+      #:go go-1.22
+      #:install-source? #f
+      #:import-path "miniflux.app/v2"
+      #:build-flags
+      #~(list (string-append
+               "-ldflags= -X miniflux.app/v2/internal/version.Version="
+               #$version))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-manpage
+            (lambda* (#:key import-path #:allow-other-keys)
+              (let ((man1 (string-append #$output "/share/man/man1/"))
+                    (page (format #f "src/~a/miniflux.1" import-path)))
+                (install-file page man1))))
+          (add-after 'install-manpage 'rename-binary
+            (lambda _
+              (let ((bindir (string-append #$output "/bin/")))
+                (rename-file (string-append bindir "v2")
+                             (string-append bindir "miniflux"))))))))
     (inputs
      (list go-github-com-abadojack-whatlanggo
            go-github-com-andybalholm-brotli
@@ -400,7 +401,7 @@ (define-public miniflux
 @item Use only modern vanilla Javascript (ES6 and Fetch API)
 @item Single binary compiled statically without dependency
 @item The number of features is voluntarily limited
-@end itemize\n")
+@end itemize")
     (license license:asl2.0)))
 
 (define-public mod-wsgi
-- 
2.41.0

bug#70684: [PATCH go-team 0/6] Update miniflux to 2.1.3

[Sharlatan Hellseher]

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


Hi,

Pushed as b913514169..819d33a18d to master with updating miniflux to the
latest version and minor adjustment to new packages descriptions.

--
Oleg

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