From patchwork Thu Jul 4 11:10:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 65908 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 E0C1E27BBEA; Thu, 4 Jul 2024 12:13:34 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F0FB727BBE2 for ; Thu, 4 Jul 2024 12:13:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPKOf-0002Cu-AN; Thu, 04 Jul 2024 07:13: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 1sPKOd-0002AQ-HZ for guix-patches@gnu.org; Thu, 04 Jul 2024 07:13: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 1sPKOd-00038d-8G for guix-patches@gnu.org; Thu, 04 Jul 2024 07:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPKOf-00033a-Hk for guix-patches@gnu.org; Thu, 04 Jul 2024 07:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70684] [PATCH v2 8/9] gnu: miniflux: Update to 2.1.3. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jul 2024 11:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70684 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70684@debbugs.gnu.org Cc: Sharlatan Hellseher , Rodion Goritskov Received: via spool by 70684-submit@debbugs.gnu.org id=B70684.172009155611643 (code B ref 70684); Thu, 04 Jul 2024 11:13:05 +0000 Received: (at 70684) by debbugs.gnu.org; 4 Jul 2024 11:12:36 +0000 Received: from localhost ([127.0.0.1]:41634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPKOB-00031a-OW for submit@debbugs.gnu.org; Thu, 04 Jul 2024 07:12:36 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:53696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPKNy-0002zw-QY for 70684@debbugs.gnu.org; Thu, 04 Jul 2024 07:12:27 -0400 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42565cdf99cso4271705e9.3 for <70684@debbugs.gnu.org>; Thu, 04 Jul 2024 04:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720091475; x=1720696275; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GICtR9b8u27dYZpN9FyyGA9N/1+WQhC82zDOj/lBAfg=; b=fN7MdM+oJxSVaRh5oSxX2T6q2cC9Dx8ExaSRf0X0qYqMnKZNzPgzuhU4O+tkKD4kxN 0i9DejvNe/8eXFNWAFQvLZODfZTuqboXYC3LIPCHSynZRs6MJJIENQemTebgNNSkQdXM QGyn2exQqxSCcFHl2CrWvfsPSsVPW/w2+obTlaix01kuDCCLdqAQSLNvuKYlGYfs+g5h ofCLxtYLfXL4r8hghX72OwE/hPMWdH/XIBT/ETa1ZCZ1ZY07q4T9u6uuNB1RbZBHB3u5 f9KlqsNBJarv9Gno+V91jcBdNNXso7BVJzZ+xdZ0RcA9lAtX8ZoeRxD2EzdIz/Mdb8L9 +qJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720091475; x=1720696275; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GICtR9b8u27dYZpN9FyyGA9N/1+WQhC82zDOj/lBAfg=; b=l85Cbo56RKvDA59g1BFddquCE3GCSV1pfCUpAuwzwUsYs5slLobmZrG7H8CwEU4IcT jRFJ0LwNuh4SAvzAMBeLphkctCngSD1NNct+tUs0gqQQtGqffvrv/Frsi8SCqOB4CpJS t/LoccG915oHV1Mk1wEiciC9Zx0/+2DuDDLm8nEVYuXzFyLl9F0REft4JEjmTcRqQgw7 Uq9saU/XUMy5/9VBU+MbjniCs7UpKx1C1B9buSVdAzOJhnGOq9B+CobFMU4uM6+2iKoT E7rAP3gQtq7OOn7DxYdwMw8vuyVBn0KSiMqtJHOQ4Es54UbrSp+OGEQe573pJD63IGck r3qw== X-Gm-Message-State: AOJu0YzoMGim19kS77xZURAgMDcMClO9pz7Snxtv0SUZVBJHuj/5lEBQ 8BZUKBP6fW2RS6UK9XpfIpr+Gm9zCre2gVw+tu3kyzlAwkUR7aJ/1kFd6Ql7 X-Google-Smtp-Source: AGHT+IGhmsvcSYCX2wpLYVsocS/BewTgainZEJ94INAMkn+O1s1rUmCUuJQHEU1m3C2e813ZSSFiTw== X-Received: by 2002:a7b:c84c:0:b0:425:6976:f5d6 with SMTP id 5b1f17b1804b1-4264a415d86mr10932975e9.33.1720091474830; Thu, 04 Jul 2024 04:11:14 -0700 (PDT) Received: from guxtil.incerto.xyz (bagu-15-b2-v4wan-170076-cust245.vm21.cable.virginm.net. [77.98.0.246]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3679508ff26sm3698486f8f.111.2024.07.04.04.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 04:11:14 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 4 Jul 2024 12:10:58 +0100 Message-ID: <9c415a5288a9a5826b2d41e18dbaaeb3c79753d9.1720090727.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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 From: Rodion Goritskov * 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 --- 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")