[PATCH] gnu: miniflux: Update to 2.0.45.

  • Done
  • quality assurance status badge
Details
2 participants
  • Hilton Chain
  • ???
Owner
unassigned
Submitted by
Hilton Chain
Severity
normal
H
H
Hilton Chain wrote on 2 Jul 2023 11:50
(address . guix-patches@gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
74ed71415d21f1e08893c216ea8adc672787f44e.1688291271.git.hako@ultrarare.space
* gnu/packages/web.scm (miniflux): Update to 2.0.45.
[arguments]<#:build-flags>: Set version.
<#:phases>: Add 'disable-cgo.
---
gnu/packages/web.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

Toggle diff (39 lines)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ad5ec0aba7..6d4ffda097 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -323,7 +323,7 @@ (define-public httpd/pinned
(define-public miniflux
(package
(name "miniflux")
- (version "2.0.44")
+ (version "2.0.45")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -332,14 +332,20 @@ (define-public miniflux
(file-name (git-file-name name version))
(sha256
(base32
- "18ggk71nk3zylgkwq32glggdcapgsj772qn2y4i9hbk374l6h61w"))))
+ "0hyhn0qllw37gxn8vzgjxjvmip31zp7gnd7g55j9cpd4rm0pxppx"))))
(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 'rename-binary
(lambda _
(let ((bindir (string-append #$output "/bin/")))

base-commit: a919a16898e7219fdd26bdfe33a9959e7156d59d
--
2.40.1
H
H
Hilton Chain wrote on 13 Jul 2023 18:42
[PATCH v2 0/1] gnu: miniflux: Update to 2.0.45.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
cover.1689266148.git.hako@ultrarare.space
v1 -> v2: Install manpage.

Hilton Chain (1):
gnu: miniflux: Update to 2.0.45.

gnu/packages/web.scm | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)


base-commit: ff208b4b629a15ce0b72555db1cda9fcb7eec1c9
--
2.41.0

Diff range from v1 to v2:
Toggle diff (18 lines)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6d4ffda097..eca6f5bd9e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -346,7 +346,12 @@ (define-public miniflux
(add-before 'build 'disable-cgo
(lambda _
(setenv "CGO_ENABLED" "0")))
- (add-after 'install 'rename-binary
+ (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")
H
H
Hilton Chain wrote on 13 Jul 2023 18:43
[PATCH v2 1/1] gnu: miniflux: Update to 2.0.45.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
4985c50689b18b352625b7e9d14643b0b1047c29.1689266148.git.hako@ultrarare.space
* gnu/packages/web.scm (miniflux): Update to 2.0.45.
[arguments]<#:build-flags>: Set version.
<#:phases>: Add 'disable-cgo, 'install-manpage.
---
gnu/packages/web.scm | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ad5ec0aba7..eca6f5bd9e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -323,7 +323,7 @@ (define-public httpd/pinned
(define-public miniflux
(package
(name "miniflux")
- (version "2.0.44")
+ (version "2.0.45")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -332,15 +332,26 @@ (define-public miniflux
(file-name (git-file-name name version))
(sha256
(base32
- "18ggk71nk3zylgkwq32glggdcapgsj772qn2y4i9hbk374l6h61w"))))
+ "0hyhn0qllw37gxn8vzgjxjvmip31zp7gnd7g55j9cpd4rm0pxppx"))))
(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-after 'install 'rename-binary
+ (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")
--
2.41.0
?
?
??? wrote on 22 Jul 2023 03:55
Re: bug#64413: [PATCH] gnu: miniflux: Update to 2.0.45.
(name . Hilton Chain)(address . hako@ultrarare.space)(address . 64413@debbugs.gnu.org)
87ilacn216.fsf_-_@envs.net
Hello, just FYI 2.0.46 is out, and it require update go-oidc and various other Go
packages...
H
H
Hilton Chain wrote on 22 Jul 2023 06:24
(name . ????)(address . iyzsong@envs.net)
874jlw1skz.wl-hako@ultrarare.space
On Sat, 22 Jul 2023 09:55:01 +0800,
??? wrote:
Toggle quote (3 lines)
> Hello, just FYI 2.0.46 is out, and it require update go-oidc and
> various other Go packages...

In fact, before I saw the mail, I had already finished packaging
2.0.46. XD

FYI, only the go-oidc update is required to build it.
H
H
Hilton Chain wrote on 22 Jul 2023 06:29
[PATCH v3 0/3] gnu: miniflux: Update to 2.0.46.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
cover.1689999109.git.hako@ultrarare.space
v2->v3: Update miniflux to 2.0.46.
Package new dependency.

Hilton Chain (3):
gnu: Add go-github-com-go-jose-go-jose-v3.
gnu: Add go-github-com-coreos-go-oidc-v3.
gnu: miniflux: Update to 2.0.46.

gnu/packages/golang.scm | 39 +++++++++++++++++++++++++++++++++++++++
gnu/packages/web.scm | 19 +++++++++++++++----
2 files changed, 54 insertions(+), 4 deletions(-)


base-commit: 03ae5bb866151de7c19561a7da6f477156e4b305
--
2.41.0
H
H
Hilton Chain wrote on 22 Jul 2023 06:32
[PATCH v3 1/3] gnu: Add go-github-com-go-jose-go-jose-v3.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
5c269800bf17eae3a35f7510220f4fa76f1c0179.1689999109.git.hako@ultrarare.space
* gnu/packages/golang.scm (go-github-com-go-jose-go-jose-v3): New variable.
---
gnu/packages/golang.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

Toggle diff (30 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ea6aadbe80..ee7eb607ae 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3261,6 +3261,23 @@ (define-public go-gopkg-in-square-go-jose-v2
Encryption, JSON Web Signature, and JSON Web Token standards.")
(license license:asl2.0)))
+(define-public go-github-com-go-jose-go-jose-v3
+ (package
+ (inherit go-gopkg-in-square-go-jose-v2)
+ (name "go-github-com-go-jose-go-jose-v3")
+ (version "3.0.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/go-jose/go-jose")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5"))))
+ (arguments
+ (list #:import-path "github.com/go-jose/go-jose/v3"))))
+
(define-public go-gopkg.in-tomb.v2
(let ((commit "d5d1b5820637886def9eef33e03a27a9f166942c")
(revision "0"))
--
2.41.0
H
H
Hilton Chain wrote on 22 Jul 2023 06:32
[PATCH v3 2/3] gnu: Add go-github-com-coreos-go-oidc-v3.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
ad86e7f428ddb77de0af8cfcd2c3bf745adf8d7a.1689999109.git.hako@ultrarare.space
* gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): New variable.
---
gnu/packages/golang.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

Toggle diff (35 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ee7eb607ae..5a53838435 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9589,6 +9589,28 @@ (define-public go-github-com-coreos-go-oidc
@code{go-golang-org-x-oauth2} package.")
(license license:asl2.0)))
+(define-public go-github-com-coreos-go-oidc-v3
+ (package
+ (inherit go-github-com-coreos-go-oidc)
+ (name "go-github-com-coreos-go-oidc-v3")
+ (version "3.6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coreos/go-oidc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9"))))
+ (arguments
+ (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3.
+ #:import-path "github.com/coreos/go-oidc/v3/oidc"
+ #:unpack-path "github.com/coreos/go-oidc/v3"))
+ (propagated-inputs
+ (list go-github-com-go-jose-go-jose-v3
+ go-golang-org-x-oauth2))))
+
(define-public go-github-com-coreos-go-semver
(package
(name "go-github-com-coreos-go-semver")
--
2.41.0
H
H
Hilton Chain wrote on 22 Jul 2023 06:33
[PATCH v3 3/3] gnu: miniflux: Update to 2.0.46.
(address . 64413@debbugs.gnu.org)(name . Hilton Chain)(address . hako@ultrarare.space)
cf8721ca2c9c6a0fecaa73a9a71636adaac9d18a.1689999109.git.hako@ultrarare.space
* gnu/packages/web.scm (miniflux): Update to 2.0.46.
[arguments]<#:build-flags>: Set version.
<#:phases>: Add 'disable-cgo, 'install-manpage.
[inputs]: Replace go-github-com-coreos-go-oidc with
go-github-com-coreos-go-oidc-v3.
---
gnu/packages/web.scm | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)

Toggle diff (51 lines)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ad5ec0aba7..35db7b65f5 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -323,7 +323,7 @@ (define-public httpd/pinned
(define-public miniflux
(package
(name "miniflux")
- (version "2.0.44")
+ (version "2.0.46")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -332,21 +332,32 @@ (define-public miniflux
(file-name (git-file-name name version))
(sha256
(base32
- "18ggk71nk3zylgkwq32glggdcapgsj772qn2y4i9hbk374l6h61w"))))
+ "1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb"))))
(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-after 'install 'rename-binary
+ (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
+ (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
--
2.41.0
?
?
??? wrote on 13 Aug 2023 10:03
Re: bug#64413: [PATCH] gnu: miniflux: Update to 2.0.45.
(name . Hilton Chain)(address . hako@ultrarare.space)(address . 64413-done@debbugs.gnu.org)
87y1if8j39.fsf_-_@envs.net
Hilton Chain <hako@ultrarare.space> writes:

Toggle quote (2 lines)
> * gnu/packages/web.scm (miniflux): Update to 2.0.46.

Pushed, thank you!
Closed
?