From patchwork Sat Jul 22 04:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51919 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7691827BBE2; Sat, 22 Jul 2023 05:34:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DDAE727BBE2 for ; Sat, 22 Jul 2023 05:34:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qN4Jh-0008FU-A6; Sat, 22 Jul 2023 00:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qN4Jf-0008Ee-Jf for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qN4Jf-0006OS-Bh for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qN4Je-00040M-5r for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64413] [PATCH v3 1/3] gnu: Add go-github-com-go-jose-go-jose-v3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64413@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64413-submit@debbugs.gnu.org id=B64413.169000043215367 (code B ref 64413); Sat, 22 Jul 2023 04:34:02 +0000 Received: (at 64413) by debbugs.gnu.org; 22 Jul 2023 04:33:52 +0000 Received: from localhost ([127.0.0.1]:35232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4JU-0003zl-69 for submit@debbugs.gnu.org; Sat, 22 Jul 2023 00:33:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4JR-0003zW-7s for 64413@debbugs.gnu.org; Sat, 22 Jul 2023 00:33:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1690000167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTHBooUBTT0Qvwy9jRTbUqbK+0LOMVG3Dhq9AG7DtMY=; b=tmF51ow9eypAKBU541g0tg5vzkTXl4PFv/j7v/1rRIySwcfEu6vXjCGDgYnaYMdaoqTwKi ZxyJ3xM9jSv14kEQ4xPbfQNKg1fKCIgC/jGInAbO9IELjnUeeYYygsd0TWesrArRWS+E93 7hlSu4OpSThEwdx+1TB6tIVLb5sgwndDkq6+HpYX3N+3sFNfn7BTG1BDZ1JjK4mc3jBXSW U2U4PVzm3N2XNdnPKE4GyiUJRvo0qO5hb00024dFHZ96KXcCkX+BVG66jaAWFE+VCoNhVG uEOS/+Ehz7ksVFxAIbz1/q1ytT+OD+fhOhV3rsyqJcwXVLc7WPuI+HJhhegQ6g== Date: Sat, 22 Jul 2023 12:32:58 +0800 Message-ID: <5c269800bf17eae3a35f7510220f4fa76f1c0179.1689999109.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-go-jose-go-jose-v3): New variable. --- gnu/packages/golang.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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")) From patchwork Sat Jul 22 04:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51920 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C4C0B27BBEA; Sat, 22 Jul 2023 05:34:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 33E5527BBE2 for ; Sat, 22 Jul 2023 05:34:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qN4Jg-0008Em-07; Sat, 22 Jul 2023 00:34:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qN4Jf-0008EW-1P for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qN4Je-0006N0-Q4 for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qN4Je-00040T-ME for guix-patches@gnu.org; Sat, 22 Jul 2023 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64413] [PATCH v3 2/3] gnu: Add go-github-com-coreos-go-oidc-v3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64413@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64413-submit@debbugs.gnu.org id=B64413.169000043315374 (code B ref 64413); Sat, 22 Jul 2023 04:34:02 +0000 Received: (at 64413) by debbugs.gnu.org; 22 Jul 2023 04:33:53 +0000 Received: from localhost ([127.0.0.1]:35234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4JU-0003zo-FZ for submit@debbugs.gnu.org; Sat, 22 Jul 2023 00:33:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4JT-0003ze-1T for 64413@debbugs.gnu.org; Sat, 22 Jul 2023 00:33:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1690000171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kkIDGH7U6QYXq+5uIo1jqw+6NWWEQFL8FY4qg51Vy9Q=; b=2ohu39LOHWRMVkJ58r8IByFhg5ysynHzqdqPO90egA+dUx1pvNQi3+frWHz+gweZ8BExv4 kaCw31R1NfvGTJtNItf1V0BcEQ0H302anel9Pba/3tqI3zm9jvMcdUrakyezyzNpJL7JVE Onma0wXtO0f4lJ/sYn5ucNDZ1OMV77JRHpVCgRIZEPglLeWhdcjIHn6Yp492oWorlX16Pa opxXj4PwBRV2TKiVmJPpG55hA3oWTtTZKKwN9VdAs9ul7KnSKa3NRLpyZ+NZzOINBgDnQc /8WhA2I/LjqL7jSIk5xoPhmp25IJQhGMH/L6FE4/FNH86JLzA1Ssoksf0Qx5cw== Date: Sat, 22 Jul 2023 12:32:59 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): New variable. --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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") From patchwork Sat Jul 22 04:33:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51921 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 03B8A27BBE2; Sat, 22 Jul 2023 05:35:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 038B727BBE9 for ; Sat, 22 Jul 2023 05:35:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qN4Kd-0008Rj-A6; Sat, 22 Jul 2023 00:35:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qN4Kc-0008Rb-Ds for guix-patches@gnu.org; Sat, 22 Jul 2023 00:35:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qN4Kc-0007qs-64 for guix-patches@gnu.org; Sat, 22 Jul 2023 00:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qN4Kc-00041y-2K for guix-patches@gnu.org; Sat, 22 Jul 2023 00:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64413] [PATCH v3 3/3] gnu: miniflux: Update to 2.0.46. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 04:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64413@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64413-submit@debbugs.gnu.org id=B64413.169000044615431 (code B ref 64413); Sat, 22 Jul 2023 04:35:02 +0000 Received: (at 64413) by debbugs.gnu.org; 22 Jul 2023 04:34:06 +0000 Received: from localhost ([127.0.0.1]:35239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4Jg-00040n-Up for submit@debbugs.gnu.org; Sat, 22 Jul 2023 00:34:05 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN4JU-0003zu-Sz for 64413@debbugs.gnu.org; Sat, 22 Jul 2023 00:33:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1690000173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rCxRAF2QY5OqClvheqyLVmXOThN11Fg1ctGsqmRpQN4=; b=wJlGD5HQdpHw7YAMBhA0Uup2WSO8q6tqrofLV6lbgvfxqOdbkgTd9/C8+jZLgzuiUHTugo nWOl1ime87kAsGaCsaowUDuO6i3NPaQrIov3oQjWK0Eb7Fv02Y7n3p91b0QmzMgdiC1kaj hOqeTwXD1kS8jyW8gr8V0C1Euhl9BsfUsQt+BvSps9Fe8E0boEwVTMt+fHoHDnIq4fIsj6 hSMgKvWHFDKeEs3h4EiSSSlW4DDRHtByaPuETIsdFaiq6APLrEUNR4bXWJAhc8oAxUMIuL 503saSyr/QKR7xhi+810pWXkno9TiCp0US86SCECJUS1u5WN4IrZyTW2s20R9g== Date: Sat, 22 Jul 2023 12:33:00 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) 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