From patchwork Tue Apr 30 20:42:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodion Goritskov X-Patchwork-Id: 26759 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 4BF9627BBEA; Tue, 30 Apr 2024 21:45:25 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 2759D27BBE2 for ; Tue, 30 Apr 2024 21:45:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1uLU-0003gj-T2; Tue, 30 Apr 2024 16:45:01 -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 1s1uLD-0003eo-R8 for guix-patches@gnu.org; Tue, 30 Apr 2024 16:44:47 -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 1s1uLD-0000l0-AS for guix-patches@gnu.org; Tue, 30 Apr 2024 16:44:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1uLY-0000ER-0v; Tue, 30 Apr 2024 16:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70684] [PATCH go-team 6/6] gnu: miniflux: Update to 2.1.3. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 20:45:03 +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: Rodion Goritskov , cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com X-Debbugs-Original-Xcc: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com Received: via spool by 70684-submit@debbugs.gnu.org id=B70684.1714509862844 (code B ref 70684); Tue, 30 Apr 2024 20:45:03 +0000 Received: (at 70684) by debbugs.gnu.org; 30 Apr 2024 20:44:22 +0000 Received: from localhost ([127.0.0.1]:33196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1uKr-0000DY-HU for submit@debbugs.gnu.org; Tue, 30 Apr 2024 16:44:21 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]:61608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1uKm-0000DE-Hl for 70684@debbugs.gnu.org; Tue, 30 Apr 2024 16:44:18 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2dfb4ea2bbfso44841321fa.2 for <70684@debbugs.gnu.org>; Tue, 30 Apr 2024 13:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714509829; x=1715114629; 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=ZOozQmmfqst1UkUXRNov1INDv3C/dgiqIrAAe0vgCwM=; b=QdSCFHWA/XRbnfeFqbOZQ0VEtv4aJs/ZOwPyFtaom9ubFJYuOpOE5OuDkSbegHk4EZ wf0b3OBG2h4QComh8ezIZkU+A8Fzx3QHTjO8nuLskhWKDI+UBMzNeQdKtLj34rSAxFAl 8XJwSwkhfLqUjz+nHUuhL96X2bOwXGbUvNqcQFydcJzZwkk4gwTFsJ9tG4JpVj9CbGeG 8eFOzd5LcuM2nROfJXCyDDwmyuWGcWcaiTP4X/Ot2YMg/OSqwsEWEVPnEYVuOz5BapDJ ycqd/guX/KK/jivT6tIsuWJRNEXU6heCvVUgHQYZCzfUCk1EQ/dAIfcgEir+OGOEsOG7 fUaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714509829; x=1715114629; 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=ZOozQmmfqst1UkUXRNov1INDv3C/dgiqIrAAe0vgCwM=; b=tvbdJ55fO4ISrVuc01jdKqY3lx8rgafQFI+xJrjM60B49RCH5IkW+qiejhjg+blk8B t91cehj80ybezfcp013rSV8b6vnKAbYl8fiGbEYbFUgBSHhlBHcxAy3s3F3xZryxlonW IoCTp4i8tWyQMd9JGTHdt9M3uSklOmrMxoJcQo/3QLUwjFD6mCB4fQ6eVeNu+FR3x4rg 8ymuWt487TCL0+Syz2FW2R9QQ3irqF9lBo7ya1vcQXD4J3l7nz9E/ARIMo0ziaqYb7Ao oalkYLSCRKPJPJRYLcRhcYQJK9QddgcaFXyjx0twQT1/1Dr3pNIxzrbiHzCUUDMT3rI5 OErA== X-Gm-Message-State: AOJu0Yz07T2ewCSfyTlqv55tydFgMD2DhDgp6EAXAI6HgJvvKTDddUgo 0KpNtMcE0BY9HpGcGogL3Ji9P2hSuZHiB8BKiuO7kZsydDXI/s4snWmq/g== X-Google-Smtp-Source: AGHT+IGLKuzuq9uWnsFjL23y30/C2zsZRkmyST6ZKfBl7gzXTPXveGidl/RwFGr8mWBGOTWaa3RUVw== X-Received: by 2002:a2e:9049:0:b0:2de:809e:e8b6 with SMTP id n9-20020a2e9049000000b002de809ee8b6mr551406ljg.11.1714509829110; Tue, 30 Apr 2024 13:43:49 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id bh16-20020a05600c3d1000b00419f572671dsm40932wmb.20.2024.04.30.13.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 13:43:48 -0700 (PDT) From: Rodion Goritskov Date: Wed, 1 May 2024 00:42:46 +0400 Message-ID: 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 * 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