From patchwork Wed Feb 26 09:35:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39348 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 C030327BBEA; Thu, 27 Feb 2025 08:07:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B9CA927BBE2 for ; Thu, 27 Feb 2025 08:07:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnYvD-0007L0-EC; Thu, 27 Feb 2025 03:07:07 -0500 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 1tnYv9-0007Kq-GQ for guix-patches@gnu.org; Thu, 27 Feb 2025 03:07:03 -0500 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 1tnYv8-0001ac-59 for guix-patches@gnu.org; Thu, 27 Feb 2025 03:07:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:In-Reply-To:From:To:References:Subject; bh=MTd4PW6xgsUrVjb/yPL9Py97CoJI+kLLayokJbCHpD0=; b=CJJyokva+ssZJmIfO+L+anE1b/xKlQ7HVhd6qtAI1Yj0ZjP3ngCD2cnER8GcfnFAW1X1wYhXEIY2/xJWM984CyCU26jCdKIwCHPMJzuNHIpf99rJiGsjlz0TvSGSja+xy7VgdQTOrkVe8C0Sy4TMY0ViLprlIf5acfIbNkXsPPrkLDrNEbck/gBmYd+/IP/2kNUR/5Q6MYJ7xAQvoq7VYbjDNCGR1qDZC4yXlDsNSvJ++pGfxzjbU7XQY7nSCjElq8bX1pwmKfhGUUyHrFkxVnEwYCVUgq3wVSubSl2dAFboEd7Z93htCmCfYZ+3Hbdxkduv0SoOcGr0fycyHha2WQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tnYv7-0006xX-W2 for guix-patches@gnu.org; Thu, 27 Feb 2025 03:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76581] [PATCH 0/2] Age: Fix interaction with age.el, add manpages. References: <875xkxuj19.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Feb 2025 08:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sharlatan Hellseher Cc: 76581@debbugs.gnu.org Received: via spool by 76581-submit@debbugs.gnu.org id=B76581.174064356826650 (code B ref 76581); Thu, 27 Feb 2025 08:07:01 +0000 Received: (at 76581) by debbugs.gnu.org; 27 Feb 2025 08:06:08 +0000 Received: from localhost ([127.0.0.1]:57893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnYuC-0006vb-H3 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 03:06:07 -0500 Received: from 13.mo561.mail-out.ovh.net ([188.165.33.202]:46629) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnYu6-0006v2-Ko for 76581@debbugs.gnu.org; Thu, 27 Feb 2025 03:06:02 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.176.14]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Z3P6X2qwMz1QD9 for <76581@debbugs.gnu.org>; Thu, 27 Feb 2025 08:05:56 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-4jmgb (unknown [10.110.164.75]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CB1B51FEAB; Thu, 27 Feb 2025 08:05:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-4jmgb with ESMTPSA id wBmIIuMcwGfeZAAA45EXng (envelope-from ); Thu, 27 Feb 2025 08:05:55 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0024024bab0-fde2-4c96-84cb-d818ba55f476, 852F381DE14AD356CABD73FF6ED6F710EC841544) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.140.198.241 In-Reply-To: Date: Wed, 26 Feb 2025 10:35:32 +0100 Message-ID: <87eczjdd7h.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2081788931994542610 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekieelfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefujgffkfggtgfgsehtqhertddttdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepuefgveejveetledttddtveeffefghfetffelgffghfeuudfhleelledtgeeiffehnecuffhomhgrihhnpehfihhlihhpphhordhiohenucfkphepuddvjedrtddrtddruddpudejiedrudegtddrudelkedrvdeguddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeeiheekudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=MTd4PW6xgsUrVjb/yPL9Py97CoJI+kLLayokJbCHpD0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740643556; v=1; b=GtvPa1e1Bogz5iO1ANrlJNzr3AvPYMvhg7/Yr634mbW5pPWNwF1KjbjxwgVAWtaRGGiwmXGH m9hR2YGxh7r/Jjyt9rfsb+4XvmI3uzvx1WKL2MissO0BJr551KCq8dVWZQS7I1xzqQm4EsM9t7C g7Ks9HMJw99tg1S8n26H2Gnbt2Qtlp/RmeDBp9+UFr6f0oOo5TJTNv9EEMZHQLLW3/PObK47cCk XNEgEcKBct3Da97V9xfjbsfCHpeT/Si+dbd61PE1vjAixhmfR4qwFUZD5NYMqhC5ZEnXPEQ+jGo dsVNnP63awdxtq+RF9LIawWnUG3jnP4LoILptU2n+Ls4w== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 Hi Oleg, For some reason, it doesn't seem to work with the following changes. Am I missing something ? Nicolas * gnu/packages/golang-crypto.scm (go-filippo-io-age)[source]: Add snippet to hardcode the version. --- gnu/packages/golang-crypto.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index b1a114dd80..32bf4e401d 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2021 Vagrant Cascadian ;;; Copyright © 2022 (unmatched-parenthesis ;;; Copyright © 2022 Tobias Geerinckx-Rice -;;; Copyright © 2022, 2023 Nicolas Graves +;;; Copyright © 2022, 2023, 2025 Nicolas Graves ;;; Copyright © 2023 Benjamin ;;; Copyright © 2023 Clément Lassieur ;;; Copyright © 2023 Felix Lechner @@ -139,6 +139,9 @@ (define-public go-filippo-io-age (build-system go-build-system) (arguments (list + #:build-flags + #~(list (string-append "-ldflags=-X main.version=" + #$(package-version this-package))) #:embed-files #~(list "armor.*" "header_crlf" "hmac_.*" "scrypt.*" "stanza_.*" "stream_.*" "version_unsupported" "x25519.*" "x25519_.*") @@ -2567,6 +2570,9 @@ (define-public age (name "age") (arguments (list + #:build-flags + #~(list (string-append "-ldflags=-X main.version=" + #$(package-version this-package))) #:install-source? #f #:import-path "filippo.io/age/cmd/age" #:unpack-path "filippo.io/age" @@ -2590,9 +2596,13 @@ (define-public age-keygen (inherit go-filippo-io-age) (name "age-keygen") (arguments - `(#:import-path "filippo.io/age/cmd/age-keygen" - #:unpack-path "filippo.io/age" - #:install-source? #f)))) + (list + #:build-flags + #~(list (string-append "-ldflags=-X main.version=" + #$(package-version this-package))) + #:import-path "filippo.io/age/cmd/age-keygen" + #:unpack-path "filippo.io/age" + #:install-source? #f)))) (define-public go-jwker (package/inherit go-github-com-jphastings-jwker