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

  • Open
  • quality assurance status badge
Details
2 participants
  • Rodion Goritskov
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
Rodion Goritskov
Severity
normal
R
R
Rodion Goritskov wrote on 30 Apr 22:18 +0200
(address . guix-patches@gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
cover.1714508304.git.rodion.goritskov@gmail.com
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 1/6] gnu: go-github-com-andybalholm-brotli: Update to 1.1.0.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
ba6dbcd284c1253d9d16b5509c427c0c065761e3.1714508305.git.rodion.goritskov@gmail.com
* 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(-)

Toggle diff (24 lines)
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 2/6] gnu: Add go-github-com-google-go-tpm.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
98d146f6066026b021231119f93b87184149d195.1714508305.git.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
---
gnu/packages/golang-crypto.scm | 51 ++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)

Toggle diff (64 lines)
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 3/6] gnu: Add go-github-com-x448-float16.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
50b5e65b0b216aeda8a02b1568061ee9fcf854d4.1714508305.git.rodion.goritskov@gmail.com
* gnu/packages/golang.scm (go-github-com-x448-float16): New variable.

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

Toggle diff (38 lines)
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 4/6] gnu: Add go-github-com-abadojack-whatlanggo and go-github-com-fxamacker-cbor-v2.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
5cf8e58563592213d679e9e379dd1648d7684c2e.1714508305.git.rodion.goritskov@gmail.com
* 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(+)

Toggle diff (70 lines)
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 5/6] gnu: Add go-github-com-go-webauthn.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
ac79e09a3cd2c5df9541efce296a2a4b0577a0c1.1714508305.git.rodion.goritskov@gmail.com
* 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(+)

Toggle diff (138 lines)
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
R
R
Rodion Goritskov wrote on 30 Apr 22:42 +0200
[PATCH go-team 6/6] gnu: miniflux: Update to 2.1.3.
(address . 70684@debbugs.gnu.org)(name . Rodion Goritskov)(address . rodion.goritskov@gmail.com)
b7c63db0d0d93927650901cbb108de765ec64561.1714508305.git.rodion.goritskov@gmail.com
* 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(-)

Toggle diff (128 lines)
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
S
S
Sharlatan Hellseher wrote on 3 May 00:13 +0200
[PATCH go-team 0/6] Update miniflux to 2.1.3
(address . 70684@debbugs.gnu.org)
87edajq2uq.fsf@gmail.com
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.

these two packages may be packed as single one:
<module github.com/google/go-tpm>.
Toggle snippet (4 lines)
+(define-public go-github-com-google-go-tpm-legacy-tpm2
+(define-public go-github-com-google-go-tpm-tpmutil

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>
Toggle snippet (3 lines)
+(define-public go-github-com-go-webauthn-x

This is one go-module no need to split it into 3 packages, see go.mod
<module github.com/go-webauthn/webauthn>
Toggle snippet (5 lines)
+(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

* [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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmY0EA0ACgkQdtcnv/Ys
0rXYpxAAnpsPriYXBed1y97/+RW3yvLM1TmJZGBS8O6rSU/vHuVB2CLMZcorh3s9
MOYTK9nR42T4FeEMvphQhW6LiOaBnZtIoghF0kWi4TfsjwX0R0e7JObcIUndk3QV
z7eRxq3QZGSbZhUGah0BY2Upbt2+ZBMhmP22ksYC8j6ojSdYaQ4YOOho0X+/mEU/
2tNPqUCt1ewbe68Xe9bcQmZYT3jL83/f2MNZtmMnAafF7hCCtWg/0JACj5ecTHSq
/NGaB4Hrr70bJkCmSo19+w9acuY7SwinoIbVHZu9Vf9H08EeIRvA8yXmeH3SBptx
GwT/IUeftRtizl2Z+tbo3qOcwzLcImeAyuvl+2V5xP9TY6J12yT6VyG7nXo/hyjU
pm3y5zEovu0UOdUNlnNTBUPRX9K7sVXNw8IuVqvcdaht0mEdd27kIPPmeZdtlu8P
VatgThk70YMnJosNMV40m6TuZj5NMFB47hZM1gV/35+oMMfoB2AO0b3rkbgEVeXk
ehebND90uahUuFTkIpYPkw4tW0xdMh3Gp6xtUHiA3Np1w8dazM48QDtIyNWMudIJ
qW+Og/M1+Jj8ltTPxn8n3sGoU+sKxhn2ilXKRNNGoC4C6xogR0ldGNsZTNTPUJ2a
qrpg98xGfZwPQ6dVeuO11aaPtWBRUjVLJKe96oiwpzBlxi6L+fE=
=E/Nf
-----END PGP SIGNATURE-----

R
R
Rodion Goritskov wrote on 7 May 21:22 +0200
(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)(address . 70684@debbugs.gnu.org)
87v83po2ap.fsf@gmail.com
Hi, thank you for review!

Toggle quote (11 lines)
> 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
(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))
(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?

Toggle quote (8 lines)
> 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).
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 70684@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70684
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch