From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 04:57:34 2025 Received: (at submit) by debbugs.gnu.org; 26 Feb 2025 09:57:34 +0000 Received: from localhost ([127.0.0.1]:51066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnEAY-0001xN-A1 for submit@debbugs.gnu.org; Wed, 26 Feb 2025 04:57:34 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51454) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnE9C-0001uv-HC for submit@debbugs.gnu.org; Wed, 26 Feb 2025 04:56:12 -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 1tnE92-0001sy-Mg for guix-patches@gnu.org; Wed, 26 Feb 2025 04:56:04 -0500 Received: from 13.mo584.mail-out.ovh.net ([178.33.251.8]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnE8v-0007wb-Qj for guix-patches@gnu.org; Wed, 26 Feb 2025 04:56:00 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.23]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Z2qbm0WhQz1Plc for ; Wed, 26 Feb 2025 09:55:47 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-q5f79 (unknown [10.110.118.228]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 9F02B1FDEA; Wed, 26 Feb 2025 09:55:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-q5f79 with ESMTPSA id lG9XHSPlvmeYGgAA2nSm5Q (envelope-from ); Wed, 26 Feb 2025 09:55:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S008ee87ae46-f998-4bc7-9392-96fed32df2b3, 059453C3744CFDA9EB488F40A5B6354B7B9EEFC3) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH 0/2] Age: Fix interaction with age.el, add manpages. Date: Wed, 26 Feb 2025 10:53:19 +0100 Message-ID: <875xkxuj19.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 16511040660494213723 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekgedvkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudethfeugeehffetudeltedthefhheegkefgtddtueetudelkeeliedttddvfeehnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddugeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=d/Tzq6cY+k5q3PsFBh4MhM9u+vd1bfEZ/i9HJHsSYuQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740563748; v=1; b=Leakp5DztNpIwud5sDlvC5+Rf3I08kr9PMm/ux1A0ta/+3mnhyeqoqG1lVike/nYjBF/5vZi RUPVgsBpl9UnOudftrBTfa2qV5uQB6QgXTGSQpsXuQHIbd8yVNuO4bNwt7Tu/QjA4xoYQ6LJm0I eS3jGHxMIcpOnXG1GVoTysoOsOEERh4pDiYdPx8YLGxInmt9jbtr8IqDiQe/dWcmpahxHpbWD+H 7LcWkWucF9ASAmjTKmTaCzbOLbDo9dIlYtkeQQom0AqULgy+ZIw18zrQ5G2b4OTroklJUtgNIQ8 nan/YvSFMFUmXAtBLCPLtFhB2p/VmrbkNQjbB80ZJu8GQ== Received-SPF: pass client-ip=178.33.251.8; envelope-from=ngraves@ngraves.fr; helo=13.mo584.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: sharlatanus@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) The new age.el package in Guix is unable to work because it relies on an underlying call to --version, which was broken in Guix. For the reference: https://github.com/anticomputer/age.el/issues/15 Nicolas Graves (2): gnu: age, age-keygen: Fix --version. gnu: age, age-keygen: Install manpages. gnu/packages/golang-crypto.scm | 46 +++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) -- 2.48.1 -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 05:46:53 2025 Received: (at 76581) by debbugs.gnu.org; 26 Feb 2025 10:46:53 +0000 Received: from localhost ([127.0.0.1]:51182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnEwH-0004Ge-2U for submit@debbugs.gnu.org; Wed, 26 Feb 2025 05:46:53 -0500 Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:55327) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnEwB-0004GR-97 for 76581@debbugs.gnu.org; Wed, 26 Feb 2025 05:46:50 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.162]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Z2rkX70NQz1Yl1 for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:44 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-f67qc (unknown [10.110.96.65]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4E5131FE76 for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:44 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-5b5ff79f4f-f67qc with ESMTPSA id FXTYLhPxvmcGeQAAoMCjbg (envelope-from ) for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:44 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00243e63a20-a9bc-492c-b246-67518b52e0f7, 059453C3744CFDA9EB488F40A5B6354B7B9EEFC3) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: 76581@debbugs.gnu.org Subject: [PATCH 1/2] gnu: age, age-keygen: Fix --version. Date: Wed, 26 Feb 2025 10:35:32 +0100 Message-ID: <87v7sxt23w.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 17371509662756626962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekgeefjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgfgsehtqhertddttdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepjeegveeuiefhleekveetffekvdduteehkeekgfegheelfeetteevfeehjeegvddtnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieehkeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=H2/3UsuJfYJm1tB6Y5imnnmoqZzungJRvvCLNk3fWD0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740566805; v=1; b=o/mLqVxWnTl4ym2oKk49yPNaIJ96MSjF/67RR/7vU5ZlEWr5mUDsNpLeN3HXv2MVFdkrUT0b wxeIk+fu2Xr56Je9nmmzrMKk7FEPZOrSeWU5/KtiESpopbhLgElnSYEBV+i8IbBFxK1XxyMIk6A 0bDVmaQC8QRpKZKzbwGTG57Ox/mJ71aHkea44GYzfUxJKUBvRAX1evdr1xuHo7pK5mNR2vr2hZk q8tfQG2hyeVT4WsYTUwJuhMAmbzsO1onVsbf+X7CW38iTWzgdAHOnZgPERAtgA2QJMQpVH9+1D7 zlswDA7Y9Lo3DdufPydONRlETHeUVpa6Sa8P9rn5soBDA== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang-crypto.scm (go-filippo-io-age)[source]: Add snippet to hardcode the version. --- gnu/packages/golang-crypto.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index b1a114dd80..3ff3c39698 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -14,7 +14,7 @@ ;;; Copyright =C2=A9 2021 Vagrant Cascadian ;;; Copyright =C2=A9 2022 (unmatched-parenthesis ;;; Copyright =C2=A9 2022 Tobias Geerinckx-Rice -;;; Copyright =C2=A9 2022, 2023 Nicolas Graves +;;; Copyright =C2=A9 2022, 2023, 2025 Nicolas Graves ;;; Copyright =C2=A9 2023 Benjamin ;;; Copyright =C2=A9 2023 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 2023 Felix Lechner @@ -135,7 +135,22 @@ (define-public go-filippo-io-age (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "183iqzmdwk4b35vxrdg2gdzd4277yr5bgbgl9brqv3w1dap5v4pm")))) + (base32 "183iqzmdwk4b35vxrdg2gdzd4277yr5bgbgl9brqv3w1dap5v4pm")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* '("cmd/age/age.go" + "cmd/age-keygen/keygen.go") + (("var Version string") + (format #f "var Version =3D ~s" #$version)) + ;; We can as well not require runtime/debug now, + ;; since it's only used to get the version. + (("\"runtime/debug\"") + "") + (("buildInfo, ok :=3D debug\\.ReadBuildInfo\\(\\); ok") + "false") + (("buildInfo\\.Main\\.Version") + "")))))) (build-system go-build-system) (arguments (list --=20 2.48.1 --=20 Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 05:47:04 2025 Received: (at 76581) by debbugs.gnu.org; 26 Feb 2025 10:47:04 +0000 Received: from localhost ([127.0.0.1]:51187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnEwR-0004HS-Qw for submit@debbugs.gnu.org; Wed, 26 Feb 2025 05:47:04 -0500 Received: from 7.mo561.mail-out.ovh.net ([46.105.57.200]:56801) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnEwO-0004Gt-6O for 76581@debbugs.gnu.org; Wed, 26 Feb 2025 05:47:01 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.140.55]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Z2rkp23fyz1Y0h for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:58 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-jlc67 (unknown [10.110.113.226]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B94E51FF0E for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.104]) by ghost-submission-5b5ff79f4f-jlc67 with ESMTPSA id TXvVISHxvmeEJwAApd0zGA (envelope-from ) for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 10:46:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-104R00545b6ef32-d755-4ab6-9ebb-5a0f26ebde2b, 059453C3744CFDA9EB488F40A5B6354B7B9EEFC3) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 From: Nicolas Graves To: 76581@debbugs.gnu.org Subject: [PATCH 2/2] gnu: age, age-keygen: Install manpages. Date: Wed, 26 Feb 2025 10:37:25 +0100 Message-ID: <87tt8ht23i.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 17375168841429475858 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekgeefjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffgeduffffgffgueevtedvledtkedvvddugfdujeevhefffffhgffhieetkeegvdenucffohhmrghinhepfhhilhhiphhpohdrihhonecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrddutdegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieehkeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=wZapuiUpw1hvqn6Gp0k3MG/3RpWPoCtUrK4Kx7EqUi0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740566818; v=1; b=x6K9rfNd2osHw1HzPxePYVECqRkqnFgIxYY0IqaFxw0vTUIpH9f3rG1pzS1XO7BGRAHTR/85 +wYqMRs/AUoKYXtrCFwtCDqST7oJfh+2FiMIZS+HuiV10xjLtZ9fKdfaORmvWJUryDmHRZGA5cB BC6a4v3mLiWyvbGd64pn5TrIIP+D4NM3b8+Bs/90/6WbnIXK5tjjeDdbhr0yaqEzhsTv2UQy5fk +iKKg6I10HiYJ3xb8F9WZjhp48xcIS3Yb3XyXqsQACtuymyx22y5D6NkvewXFM8Hl+qViEqm8uu 12Ff6rJktUOyJyb9sXHnTcsDjfAlk+vKIEL4pA0y4rzVA== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/golang-crypto.scm (age, age-keygen)[arguments]{phases}: Add phase 'install-doc. (go-filippo-io-age): Remove other doc files. --- gnu/packages/golang-crypto.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 3ff3c39698..74df6b8e99 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -139,6 +139,13 @@ (define-public go-filippo-io-age (modules '((guix build utils))) (snippet #~(begin + ;; Age source bundles manpages already. Seems OK not to rebuild + ;; them with ronn, they are pretty auditable. + (with-directory-excursion "doc" + (for-each delete-file '("age.1.html" + "age.1.ronn" + "age-keygen.1.html" + "age-keygen.1.ronn"))) (substitute* '("cmd/age/age.go" "cmd/age-keygen/keygen.go") (("var Version string") @@ -2598,16 +2605,28 @@ (define-public age (list "testdata/scrypt.txt" "testdata/output_file.txt" "testdata/encrypted_keys.txt" - "testdata/terminal.txt")))))))))) + "testdata/terminal.txt"))))) + (add-after 'install 'install-doc + (lambda _ + (let ((man (string-append #$output "/man/man1/"))) + (install-file "src/filippo.io/age/doc/age.1" man))))))))) (define-public age-keygen (package (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 + #:import-path "filippo.io/age/cmd/age-keygen" + #:unpack-path "filippo.io/age" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (let ((man (string-append #$output "/man/man1/"))) + (install-file + "src/filippo.io/age/doc/age-keygen.1" man))))))))) (define-public go-jwker (package/inherit go-github-com-jphastings-jwker -- 2.48.1 -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 12:08:58 2025 Received: (at 76581) by debbugs.gnu.org; 26 Feb 2025 17:08:58 +0000 Received: from localhost ([127.0.0.1]:55204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnKu1-0005Yl-P6 for submit@debbugs.gnu.org; Wed, 26 Feb 2025 12:08:58 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:49535) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tnKty-0005YR-1Y for 76581@debbugs.gnu.org; Wed, 26 Feb 2025 12:08:54 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-5452c29bacfso7577348e87.3 for <76581@debbugs.gnu.org>; Wed, 26 Feb 2025 09:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740589727; x=1741194527; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/oz1kU6US6ymkhRAuguuqQTlwPwZ7VmSYyyoeC35zVE=; b=Zv1oKD6kvgR8avDtmMhF6+48X+cmn1Q46qeQQrtIG2lY4GrSkB8vD4GzzqUnVFl5M9 kKm26nafWvVEBHXUKY+JUwxfCLip4pKFfQb7HkinMdhnV3ZbQSAlFqyR5rjousVIueFV IbkUdiqDSHQH06pJkGAdH48CWVNT4oObasmjS/YDHIJoQ+ErABHYJA1KAKHEhJpcopfK E326T6j+reuxHtzkOfSCnf6vW4MBiZePGKBfMq5kyiteU4xvmLRICuqh5Y4kAfRobffr 2lT80BxKjVIYTr5TbqLYqcDbUSvejwHv9lh1bUrcg8kgjAd9hmBd4h/wstPVe+2xZPMF YRFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740589727; x=1741194527; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/oz1kU6US6ymkhRAuguuqQTlwPwZ7VmSYyyoeC35zVE=; b=AOlLwS/vfipejOkEvYDeCmilXPkjsfgmWnKmH6vQ/aUSPtnwVVKyfKS5nUrRhpGUQl Sia8KU7h4MPSN/MuMoJ+DmyOCyntKGvfjzD1emkN3ncILFQnrIXdvkzvM3yxCpOtRp9w cPE8wOAElG128uU2h8UU3uzxyPIQi3ZdvbtizdsA9evx/VFOyp63lZWa3Dl3INsJtf0l EXOBVwCWtCyqpUJJv/VFB6/8o3CpuwqeogEHrn2iVYy8FxPnSK84ZI7G02EIr7XQlwDZ VLxaiQDVJkKETyFhE5hKzHTtoi0WWKIIuCmIjaV/ICotr8fbHUUS4oQ2pakFHMHTIw4t O1QA== X-Gm-Message-State: AOJu0Yyl5mgpy9Bx5T9ZuUUHGlVDG+LWe2/cbrnUrqI/AmpGdmEWDb15 ZfoizKED7lEUVEm+nG6JGLrO6KqrvAESXRbIB1mK7fwGqNwYwjif1nle2LLN+aBpRYg2n/SeZy9 bSgmN6n0r0T4r+dkklHXULQkYSXS5fLeC X-Gm-Gg: ASbGncuxXAb0m+/Bxb0e2z3V0aqNya0EVVZUqn0eE9NwXtki2VU7GoDNGvfWcOiO4TS EjzYVQ8OWMJCOyCN9j/b3ZHW5lvjUzOInmM+9XgedpVJOk0IrTI9TqXuZjzic1RZzIsRorSSwEq x2MpgS+w== X-Google-Smtp-Source: AGHT+IFnNaDPOO6vYAeHC2/KfHskGvHtdW6NIFbucUQSk7oeVjDF9aY1hODWsRsfLPPVZKBwmwGgopHuMHyhOLVUUMw= X-Received: by 2002:a05:6512:3b0a:b0:545:5d8:54f3 with SMTP id 2adb3069b0e04-54839282a6dmr9206451e87.53.1740589726800; Wed, 26 Feb 2025 09:08:46 -0800 (PST) MIME-Version: 1.0 References: <875xkxuj19.fsf@ngraves.fr> In-Reply-To: <875xkxuj19.fsf@ngraves.fr> From: Sharlatan Hellseher Date: Wed, 26 Feb 2025 17:08:35 +0000 X-Gm-Features: AQ5f1JoeHYnnGvU1zkOuV0zlx2XHTAQyD9ipvZV9xGphHTBs9o2sWE_c_QEnFPI Message-ID: Subject: Re: [PATCH 0/2] Age: Fix interaction with age.el, add manpages. To: Nicolas Graves Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 Cc: 76581@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Nicolas, Thanks for the patches! --8<---------------cut here---------------start------------->8--- + (base32 "183iqzmdwk4b35vxrdg2gdzd4277yr5bgbgl9brqv3w1dap5v4pm")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* '("cmd/age/age.go" + "cmd/age-keygen/keygen.go") + (("var Version string") + (format #f "var Version = ~s" #$version)) + ;; We can as well not require runtime/debug now, + ;; since it's only used to get the version. + (("\"runtime/debug\"") + "") + (("buildInfo, ok := debug\\.ReadBuildInfo\\(\\); ok") + "false") + (("buildInfo\\.Main\\.Version") + "")))))) --8<---------------cut here---------------end--------------->8--- This may be simplified with #:build-flags, see examples in golang-* > <...> "-ldflags=-X main.Version=" #$version <...> When you update the "library" package, you may keep all fields from [arguments] with something like this: --8<---------------cut here---------------start------------->8--- (define-public gops (package (inherit go-github-com-google-gops) (name "gops") (arguments (substitute-keyword-arguments (package-arguments go-github-com-google-gops) ((#:tests? _ #t) #f) ((#:install-source? _ #t) #f) ((#:skip-build? _ #t) #f))) (native-inputs (package-propagated-inputs go-github-com-google-gops)) (propagated-inputs '()) (inputs '()))) --8<---------------cut here---------------end--------------->8--- So the idea is to run tests and apply modifications on the "library" side and just adjust #:import-path on final command(s) I'm happy to review v2! --- Oleg From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 03:06:07 2025 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 From: Nicolas Graves To: Sharlatan Hellseher Subject: Re: [bug#76581] [PATCH 0/2] Age: Fix interaction with age.el, add manpages. In-Reply-To: Date: Wed, 26 Feb 2025 10:35:32 +0100 Message-ID: <87eczjdd7h.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 76581 Cc: 76581@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) 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 =C2=A9 2021 Vagrant Cascadian ;;; Copyright =C2=A9 2022 (unmatched-parenthesis ;;; Copyright =C2=A9 2022 Tobias Geerinckx-Rice -;;; Copyright =C2=A9 2022, 2023 Nicolas Graves +;;; Copyright =C2=A9 2022, 2023, 2025 Nicolas Graves ;;; Copyright =C2=A9 2023 Benjamin ;;; Copyright =C2=A9 2023 Cl=C3=A9ment Lassieur ;;; Copyright =C2=A9 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=3D-X main.version=3D" + #$(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=3D-X main.version=3D" + #$(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=3D-X main.version=3D" + #$(package-version this-package))) + #:import-path "filippo.io/age/cmd/age-keygen" + #:unpack-path "filippo.io/age" + #:install-source? #f)))) =20 (define-public go-jwker (package/inherit go-github-com-jphastings-jwker --=20 2.48.1 --=20 Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 05:33:27 2025 Received: (at 76581) by debbugs.gnu.org; 27 Feb 2025 10:33:27 +0000 Received: from localhost ([127.0.0.1]:58412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnbCo-0006jD-Ih for submit@debbugs.gnu.org; Thu, 27 Feb 2025 05:33:27 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54539) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tnbCm-0006iW-GL for 76581@debbugs.gnu.org; Thu, 27 Feb 2025 05:33:25 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4399deda38cso5119675e9.1 for <76581@debbugs.gnu.org>; Thu, 27 Feb 2025 02:33:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740652398; x=1741257198; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=1RUEfyC4i0ykOpuRwkUf4qfMIjecXOum7Aiw4/f2G5s=; b=heG8FTwzrXTHKMwZ4B/I0KmwdaDKGN39tmRN3hg7RyzVTzfD3gg/3rjgxwkff4160D VVknZ2ekdVLxrsx1n3VRCboy3puW6zHtGUWKXqQNq8cj6psqPlyPcg+De44f9MPVxlNE 8GLRiWTaSX4LxtWY4E8G2m5gDnUasYIMC+zaAVC7cnIdANoeGgZ13NBHQ+3/M2LQ0iak jLpbopgQ1JT1wH7MdBoZDusRs9SzHZKiY7QO7aMb3Y3g6MRM5qsC//mji1fNCyLlb5oE MHGZBoXk/q/m5vK5ak1zeHtWTax8p7UMg5MHQR4a0cDQNBPVGCSJ3uSnL7IotQjls/3/ yI1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740652398; x=1741257198; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1RUEfyC4i0ykOpuRwkUf4qfMIjecXOum7Aiw4/f2G5s=; b=qAzzinYLjqG5UdYt+O/29Cg2ig5w42frRtUCRbZlzNXR3THbpb4spDMIc3VjORPtcB y+vtYe0/IqBYu/UG6at8E6pyrrl2bvQB4xVDtEBxZMVeAuHYhTaDod5kTM9CHRDs3UJn Fd9Gr+FOQGaEbZe/WRXoHqEj48r8RmUqWLJv2A6wdBErvIVV+21RNwaN257wyZfIET4F J6BRD7iN44Y3v5C//IihWAXL5oShWKLGkcQcO/tm3lYQh0B8Ho4MxwfjAcrZvECzc1bL EShJ6e78qF5FHW/h8sMSVDqNvd06XqwzO2xpGXXVZpLrTvijiIJyLI59jz4iq3wIJcB0 sTqQ== X-Gm-Message-State: AOJu0Yx4nN50yPVH/pz6w/EHVpCAT84y5/SABxtHJUH2E1uQAxa/n8Kj ZRmSPpdHwxD0MMN8kRSGdNpf/8adpP16C/SyWV9UWIyPw6RZYsUIa29qxQ== X-Gm-Gg: ASbGncut1MeC/r2FHi+5E3OnWAgkuDjy3A+AmoQicYqdh5BHqWEpO7kygp13jnZeXqN 4y7YCPz69YLz0S5UhUSkpuwixbguIYmqW1OhphDiUDQ8eDAdQpzJTm2+yof+mMh7k1h3DxjJw7v Zrz8QKHEwoGgKLuyonwWfFvaZh55dqmYh+DBeniYKGwK5OL6D1W+rg+Lmg8G3et5Fhjd8ftjK1N QE3CtRLpfWCwI+sf8CuAA7CHh6EsALVEtUW6RzJ3JqLI7QLY9h6xdfLadLJvCu2qGeeSxJysmIm jRXSbKYOW/xeY4iCQxQzU4XBqdHnQ80VG/YO4XDpOYDmO2Dw91ksIMhPsThsVcpEJu3o0KvViP1 y+Q== X-Google-Smtp-Source: AGHT+IESiWvhMYizwbbJ2v6uFtAB6uK6j1i8fgDwNcU/v37wrpm53btW9cyubrA4PwKnMKmfZHtUBA== X-Received: by 2002:a05:600c:1989:b0:439:a6db:1824 with SMTP id 5b1f17b1804b1-43ab0f4271cmr114189985e9.16.1740652397530; Thu, 27 Feb 2025 02:33:17 -0800 (PST) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba532b0dsm49269885e9.13.2025.02.27.02.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 02:33:16 -0800 (PST) From: Sharlatan Hellseher To: 76581@debbugs.gnu.org Subject: [PATCH 0/2] Age: Fix interaction with age.el, add manpages. Date: Thu, 27 Feb 2025 10:33:12 +0000 Message-ID: <87jz9bu17b.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Nicolas, I've tackled it and made it work with some sort of simplification, please see v3 following this email. CLI tools are merged into one package: =2D-8<---------------cut here---------------start------------->8--- > tree $(./pre-inst-env guix build age) /gnu/store/wpaqwb40l2bzzbgjyqkn177mwc7f0v3l-age-1.2.1 =E2=94=9C=E2=94=80=E2=94=80 bin =E2=94=82=C2=A0=C2=A0 =E2=94=9C=E2=94=80=E2=94=80 age =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 age-keygen =E2=94=9C=E2=94=80=E2=94=80 etc =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 ld.so.cache =E2=94=94=E2=94=80=E2=94=80 share =E2=94=9C=E2=94=80=E2=94=80 doc =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 age-1.2.1 =E2=94=82=C2=A0=C2=A0 =E2=94=94=E2=94=80=E2=94=80 LICENSE =E2=94=94=E2=94=80=E2=94=80 man =E2=94=94=E2=94=80=E2=94=80 man1 =E2=94=9C=E2=94=80=E2=94=80 age.1.zst =E2=94=94=E2=94=80=E2=94=80 age-keygen.1.zst 8 directories, 6 files =2D-8<---------------cut here---------------end--------------->8--- And versions: =2D-8<---------------cut here---------------start------------->8--- > $(./pre-inst-env guix build age)/bin/age --version 1.2.1 [env: /gnu/store/gpahyx6mjm17ydpxyxvry2pqiwm7kdj5-profile] > $(./pre-inst-env guix build age)/bin/age-keygen --version 1.2.1 [env: /gnu/store/gpahyx6mjm17ydpxyxvry2pqiwm7kdj5-profile] =2D-8<---------------cut here---------------end--------------->8--- Please check if it works with Emacs' package now. =2D-- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJKBAEBCgA0FiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmfAP2gWHHNoYXJsYXRh bnVzQGdtYWlsLmNvbQAKCRB21ye/9izStdHQD/4nEMi+xMBqHJqaP7q1tdhwwDsy rGXIMXrbnZE4+4sBr95PVGsgbxggCyZDwgiHJ17m0aBpt7/w04CiwJu+qA0jLZG2 f1CJ3xaKPH/ShF3KiGMSYZXuOBIP2wk5BIgPjTnvFpYo58tMmb63Lz63e2TRRIrT 8x9NzUMadmcVkfQcF8mOztICP8jmJhZqEGs6eaC+U8oLqBZI31GBUFjfbIXcy8B4 RHfh6nAX7VYjx547OyZzpWplYWYh/OO/dGhaVdvYE1xrwRKF7gI/QjRK6aT4wlXi uYigPW7sK7gQ5/831Hkn04dFNSnLiMUKXv0Hh2b7WnO08b42uPWnHX0KR8S6ffHZ dUPrzt3P+Lsh+PFdwqgUstvMDGaogCbmVvOUBPRu5cAeIJcoeohyrfjHPxYwvJvs KjSrBNO3EBlhMZDOu4J+d7PPjjBeenLEyCSfas0OgBELQ5nEq9hbDtzBWmqUBgRJ QZii5yzsYOryIZAJ5wJ9MP9p7jGuRLYfIhWLyQaTYHC2H6WxV8/9Oh/zWYsDpr8q hAu9fQ4Z7ruRJgj5wYNyYRtu+BSipNF/VCjZLH7p491X3SwXgRc7O0q3ERHNTlLL 7VPoaK0oeEUzCgcguGPtu8f7kKwNv1a06nmXBBV1fRkJRn9AiQ08tWNuZe/g+xI+ wodMPNZapKvjm2jnrA== =wtDl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 05:34:18 2025 Received: (at 76581) by debbugs.gnu.org; 27 Feb 2025 10:34:18 +0000 Received: from localhost ([127.0.0.1]:58426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnbDd-0006nx-AT for submit@debbugs.gnu.org; Thu, 27 Feb 2025 05:34:18 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:56322) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tnbDa-0006nO-AD for 76581@debbugs.gnu.org; Thu, 27 Feb 2025 05:34:15 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-38f378498b0so555804f8f.0 for <76581@debbugs.gnu.org>; Thu, 27 Feb 2025 02:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740652448; x=1741257248; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=a8o0tVa32WHq5GKgn/3JQ6yNE+xzbHzkmDaRTRfgmDk=; b=jAvF6p/Rcp5f2l1gHrk8TCYj5bqw7JUdb0aP4Lxk8o0o/WObswqYcUzbcz5eZs5E1e nYaeNpAPNOo4IQh3FTm+n3AqQWkJKD00jU7GHB5aJdPXP06CnAL+ojP42iGOdyDRPJeR kyjotKfqD903I/JQ5d48JkRBo7GZfZc5x568//8rP8+HTuU6K+Rtb5EHZze3Y6/EOAGC rhVQ8Y70+Hd7MO8vCJ7qJ8E8QhfPTRBPTayvHhbuP+NPGEeFcqXURldg7rJX237gqgt7 B5bCMfT1qJRLcH+hQzLfP3D176azcI1PQ7AFdTkhSeAxnPFD610yG+yR7QPo08EZAE3G vtzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740652448; x=1741257248; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a8o0tVa32WHq5GKgn/3JQ6yNE+xzbHzkmDaRTRfgmDk=; b=EtH2U1PbDu4orsgah86A+w4pxkgWeSM42Y3n6tLPjFGU7hMS/iEpUVsYZiZP8+Z6WL wxka1uDLTdNuf5KZh2P0p50PJSJF0l20WgIhwZpZe38H0S4Kw+ywY26x2s+okbhP+797 UBSzu1ycSSme5L10dLsSXDWJSCQ+zhlxdX1F7q54KJ453vzQGlfSFRdtlEn55J74Gckb SCWpG7gBmArnzvol8RF++/9ukBx9YCwtjSRv8DY3v8cQiEMb3m2aTRVmaqzYhe16Iald yt8jB5XdyXxTL1dvlW7HU/krHA3krP7e6v/pv4Dto0Y3tWL+wUbdwc/wWEF4/78BHV7i YELg== X-Gm-Message-State: AOJu0YyYNulmaAHwquWMctHZ7MaEr2rjh/xYCzW1+PO/s5ph5/YVAONH oXW1zGdogB3vQgojXbDZpa6JuZc34FXmI6s1BZiReSGLurLOiXqM1jyj/Q== X-Gm-Gg: ASbGncvc+C8hZS7MjKMVwT+KY6FWHIR/jVh07NJrDz9qgQsXbfLauHnA1pU5aGHuZkV 2wtH1EoQnj0aL/LReKiraMYVOmRCXSAQrczGGt+qTLtolbcxjbb7MEchr8DfKkb4KVCBPdUfdcb DN6cDfKkhv3HImhwRhxctaZcBuKu5CXydRyTwWyXdzZle2ehJ5Fm1vNP1pDmFE3YaggcCAUDt2w z/nZtqeGLZZ+Y7b8uqGMK8Cj0nTNXd7YTLadv4/bXEwhYWzameMRSnnjBEqhXqjlAPtRdmnGJE0 2hvKHWlTgfIH1tyeWM4pR1FVV492Mj9O0mD9tw6TdG6Z2sBxx7LZr8ppp2djnkyuO4FAZzsMSLw ncf0XCG4vyUTCeUwDoQ== X-Google-Smtp-Source: AGHT+IHSi5DBvNtf3BPqa/1895KjOOVtm71x6kZgxdPLA83KcYkdJ+WzmM0WhvHMkWwjZFmv4xozlA== X-Received: by 2002:a05:6000:1366:b0:38f:5120:129d with SMTP id ffacd0b85a97d-390d4fa34demr4413716f8f.49.1740652447935; Thu, 27 Feb 2025 02:34:07 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba57145esm49708985e9.30.2025.02.27.02.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 02:34:07 -0800 (PST) From: Sharlatan Hellseher To: 76581@debbugs.gnu.org Subject: [PATCH v3 1/2] gnu: age: Merge packages with executibles into single one. Date: Thu, 27 Feb 2025 10:33:58 +0000 Message-ID: <05e0793479e09dc196070dd98dd273f094289356.1740651749.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 Cc: Nicolas Graves , Sharlatan Hellseher X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Reported in #76581: Age: Fix interaction with age.el, add manpages. * gnu/packages/golang-crypto.scm (go-filippo-io-age) [arguments] : Set version. [description]: Fix it. (age): Swap to PACKAGE/INHERIT, simplify package definition and build all commands. [arguments] : Remove 'remove-failing-test-data-files. Use custom 'build. (age-keygen): Delete variable. Co-authored-by: Nicolas Graves Change-Id: I8f4892dfceef34c47f945efce8ddfa9787102d4a --- gnu/packages/golang-crypto.scm | 60 ++++++++++++++++------------------ 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index b1a114dd807..b79fa01dbb2 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -139,6 +139,8 @@ (define-public go-filippo-io-age (build-system go-build-system) (arguments (list + #:build-flags #~(list (string-append "-ldflags=-X main.Version=" + #$version)) #:embed-files #~(list "armor.*" "header_crlf" "hmac_.*" "scrypt.*" "stanza_.*" "stream_.*" "version_unsupported" "x25519.*" "x25519_.*") @@ -155,9 +157,8 @@ (define-public go-filippo-io-age (synopsis "Secure file encryption tool, format, and Go library") (description "This package implements file encryption according to the -@{age-encryption.org/v1, https://age-encryption.org/v1} specification. -It features small explicit keys, no configuration options, and Unix-style -composability.") +@url{https://age-encryption.org/v1} specification. It features small explicit +keys, no configuration options, and Unix-style composability.") (license license:bsd-3))) (define-public go-filippo-io-edwards25519 @@ -2562,37 +2563,32 @@ (define-public go-torproject-org-pluggable-transports-goptlib ;;; (define-public age - (package - (inherit go-filippo-io-age) + (package/inherit go-filippo-io-age (name "age") (arguments - (list - #:install-source? #f - #:import-path "filippo.io/age/cmd/age" - #:unpack-path "filippo.io/age" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-failing-test-data-files - ;; FIXME: testdata/output_file.txt:49: unknown command "ttyin" - ;; age: error: input and output file are the same: "inputcopy" - ;; age: error: input and output file are the same: "./inputcopy" - ;; age: error: input and output file are the same: "keycopy" - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (for-each delete-file - (list "testdata/scrypt.txt" - "testdata/output_file.txt" - "testdata/encrypted_keys.txt" - "testdata/terminal.txt")))))))))) - -(define-public age-keygen - (package - (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)))) + (substitute-keyword-arguments + (package-arguments go-filippo-io-age) + ((#:tests? _ #t) #f) + ((#:install-source? _ #t) #f) + ((#:unpack-path _ "") "filippo.io/age") + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'build + (lambda* (#:key import-path #:allow-other-keys #:rest arguments) + (for-each + (lambda (cmd) + (apply (assoc-ref #$phases 'build) + `(,@arguments + #:import-path ,(string-append import-path cmd)))) + (list "/cmd/age" + "/cmd/age-keygen")))))))) + (native-inputs (package-propagated-inputs go-filippo-io-age)) + (propagated-inputs '()) + (inputs '()) + (description + (string-append (package-description go-filippo-io-age) + "\nThis package provides a command line interface (CLI) +tools.")))) (define-public go-jwker (package/inherit go-github-com-jphastings-jwker base-commit: 4270c484ca174ad97d1add91fa5fc69041a6af9d -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 05:34:27 2025 Received: (at 76581) by debbugs.gnu.org; 27 Feb 2025 10:34:27 +0000 Received: from localhost ([127.0.0.1]:58428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnbDm-0006oR-Eq for submit@debbugs.gnu.org; Thu, 27 Feb 2025 05:34:27 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:61674) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tnbDb-0006nQ-4v for 76581@debbugs.gnu.org; Thu, 27 Feb 2025 05:34:16 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-38f406e9f80so526691f8f.2 for <76581@debbugs.gnu.org>; Thu, 27 Feb 2025 02:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740652449; x=1741257249; 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=0vKWkz+hLXeV4cBpCpKfxkUM6znIT542Ka3oJRT7Oj0=; b=h/jtdXsXl7tSZRV7Kw6RdHHl9c8C2Cz8HMq70VPZkdXqdGs2CohSJ7+9zKuII1C6xF m0DF+GmuDLOC5gbnk9eqoy5d2Boa/7jSrIxRls20pu8qv511bUtDB+RwK/MxdJ5vXArm VNcStmCclAtFxjYN57ZnilKBtTharKagknKKBVgqVwDoXBTjRedqC9tWikREXuQ3B2Vt 7nZaGuQxsJuRO7nq6fAhR8O915L72Nrr6Pi6ZjM6G8LCLWLcKbjuD6RcmXPvGLlnfboj TMd64PEeoDkblLEAhhwCv36pdqTxGZzPRhZdxlbzLhD3j07BGFbQlC2Z6KPJcVFcm/V6 qOqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740652449; x=1741257249; 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=0vKWkz+hLXeV4cBpCpKfxkUM6znIT542Ka3oJRT7Oj0=; b=L+uRwuSIXb3RtnzuNUuZz72Gqo6PFbguApCmphxaXQpmTzjFwolGFr8rKy5mTCRwhL 2ui0nGBocfWneCzuyVo/kyEE6D0PcsWLdgDbvbqNXiC4PGJOBLTqq8QeKzlvEO80wCJp hXvR4Rov3hZjVKj8BbonP5CUVt1S+BFzfpb6vfRQvz/T+xbIh7LIp7qgcVe4ikLiSeMN TbdTJpqgAkk3CY6ybEexjndeIwi1EPKqUYnv5joNQwdqKhiXh+QaMjC3clC17w6wS559 pyo86NcGQsa0Ii5MkXkuScLjx0LrP6oRCibqq9dabqd3GLabVvKG6gEKb7ecStZjAxDI LjOQ== X-Gm-Message-State: AOJu0YxIisUcoHp64ZxNZnq9+LM7rE5Ixec2ogsoA/awmKqFCVLjtPnl 0Fvmer9ZK9QCQzRLZTPZ8HU4uohDMQJst3VPMRTp9rNJ1ZffKyhwHbeY9w== X-Gm-Gg: ASbGncu9EaFLpmITdwuI7Tm06YqQFX8mNOsT/4JlKPeYDAUdpUjXVel8LuXzqFspIVl MWbON4ZgK4Uqst9869d9P+VJ1wkawRd3u29sViIe7XaLmslE7AglgTe/Z49gkMb1YX+vygAvDX5 +uQTihCiMWguREU96QML8VPqW4Z+ndr/P807y1IWMELDikPrfCvWrd+23aIL8qZacRQx5qPJmqr bJPa6WV54XgrsyM1BQju8ggJgac5aPgXGPSgqaabt2gub76pbSNe4VZcK1S16VdWj0ZgRbi5bBS 7FtX8Hhc3H4uqWE2uuinS2rWEehJb/kzK8JCb6USnjjn5Uwt/SNOxQFCASOj4SGLTunZNaIqNb7 3W6DsaJXV/chuk5OIqA== X-Google-Smtp-Source: AGHT+IHSBG9fu4HPD0UAcvQtcgCnFkrLe8MKTqjBI1Jsn8UkyPYns3PDanEFfGn2lPRaEcGevs3OhA== X-Received: by 2002:a5d:5888:0:b0:390:d7e5:e8b2 with SMTP id ffacd0b85a97d-390d7e5e9a0mr4349117f8f.17.1740652448895; Thu, 27 Feb 2025 02:34:08 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba57145esm49708985e9.30.2025.02.27.02.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 02:34:08 -0800 (PST) From: Sharlatan Hellseher To: 76581@debbugs.gnu.org Subject: [PATCH v3 2/2] gnu: age: Install manpages. Date: Thu, 27 Feb 2025 10:33:59 +0000 Message-ID: <1eced91b82c0e15a3603942e58be25b6924088e9.1740651749.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <05e0793479e09dc196070dd98dd273f094289356.1740651749.git.sharlatanus@gmail.com> References: <05e0793479e09dc196070dd98dd273f094289356.1740651749.git.sharlatanus@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 Cc: Nicolas Graves X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Nicolas Graves * gnu/packages/golang-crypto.scm (go-filippo-io-age): Remove other doc files. (age): [arguments] : Add 'install-man-pages. Change-Id: I58e10755c907af5a67083fb22682efdd4c4b7c92 --- gnu/packages/golang-crypto.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index b79fa01dbb2..b0420f2a043 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 @@ -135,7 +135,17 @@ (define-public go-filippo-io-age (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "183iqzmdwk4b35vxrdg2gdzd4277yr5bgbgl9brqv3w1dap5v4pm")))) + (base32 "183iqzmdwk4b35vxrdg2gdzd4277yr5bgbgl9brqv3w1dap5v4pm")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Age source bundles manpages already. Seems OK not to rebuild + ;; them with ronn, they are pretty auditable. + (with-directory-excursion "doc" + (for-each delete-file '("age.1.html" + "age.1.ronn" + "age-keygen.1.html" + "age-keygen.1.ronn"))))))) (build-system go-build-system) (arguments (list @@ -2581,7 +2591,12 @@ (define-public age `(,@arguments #:import-path ,(string-append import-path cmd)))) (list "/cmd/age" - "/cmd/age-keygen")))))))) + "/cmd/age-keygen")))) + (add-after 'install 'install-man-pages + (lambda _ + (let ((man (string-append #$output "/man/man1/"))) + (install-file "src/filippo.io/age/doc/age.1" man) + (install-file "src/filippo.io/age/doc/age-keygen.1" man)))))))) (native-inputs (package-propagated-inputs go-filippo-io-age)) (propagated-inputs '()) (inputs '()) -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 06:06:11 2025 Received: (at 76581) by debbugs.gnu.org; 27 Feb 2025 11:06:11 +0000 Received: from localhost ([127.0.0.1]:58689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnbiV-00019a-4U for submit@debbugs.gnu.org; Thu, 27 Feb 2025 06:06:11 -0500 Received: from 6.mo583.mail-out.ovh.net ([178.32.119.138]:33711) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnbiO-00019I-Th for 76581@debbugs.gnu.org; Thu, 27 Feb 2025 06:06:09 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Z3T6L3vN1z1FSH for <76581@debbugs.gnu.org>; Thu, 27 Feb 2025 11:06:02 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-gxd8v (unknown [10.111.174.16]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id F21E41FE6A; Thu, 27 Feb 2025 11:06:01 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-gxd8v with ESMTPSA id Q6oiIBlHwGe9ZAAA761sng (envelope-from ); Thu, 27 Feb 2025 11:06:01 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004835b4c18-c49d-4c92-82cd-e0c023cdb544, 852F381DE14AD356CABD73FF6ED6F710EC841544) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.140.198.241 From: Nicolas Graves To: Sharlatan Hellseher , 76581@debbugs.gnu.org Subject: Re: [bug#76581] [PATCH 0/2] Age: Fix interaction with age.el, add manpages. In-Reply-To: <87jz9bu17b.fsf@gmail.com> References: <875xkxuj19.fsf@ngraves.fr> <87jz9bu17b.fsf@gmail.com> Date: Thu, 27 Feb 2025 12:06:00 +0100 Message-ID: <871pvjmyuf.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 5123407528645550610 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekjeeftdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeiteefveduheejhfevueekfeehfffgjeehieekgfevkeetieehjefgleeigffhueenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupddujeeirddugedtrdduleekrddvgedupdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieehkeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Qz7i7NneAh9xTkh+oUdmVPVlO24/7Y2TG922eRPZcA4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740654362; v=1; b=2P7ufU9T5AT6gvtqkeNhCmDVYggFvLYcR6IlOAjW6LdYDrqe7J/111u3XrbSYeQSICpqUgF9 5zSeFxFI0JBKfM72THmCZ3oCpafiTVmZKRbQwIZiN8bnhkSAbawpKILLXka7kboOO5eLZJ/ckrr srIuHVP2eCZJYg3M0fLkUX8f4xWG3o3zamxyO3oEvTNf1/wiNm/zXnvd3aov/cQBOx5bynEcjWT elvtbPqGwMq/Qe4COfwAXPlp8GlxXN5LRBP56bZUEC4dEGbUJj2wW6TpjJ8N726GmD5G0mSaISv 0I2cVyKiL0uAiVCALCyTjpUSiHd5wyY7Y/DXG2T0gGMOA== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-02-27 10:33, Sharlatan Hellseher wrote: > Hi Nicolas, > > I've tackled it and made it work with some sort of simplification, > please see v3 following this email. Read, looks fine to me. > Please check if it works with Emacs' package now. I have other issues to fix in passage.el to be able to properly use it the way I want[1], but my v1 is tested: as soon as --version is fixed, it will be OK. You should go ahead and push them :) TY! [1] https://github.com/anticomputer/passage.el/issues/2 -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 27 06:51:19 2025 Received: (at 76581-done) by debbugs.gnu.org; 27 Feb 2025 11:51:20 +0000 Received: from localhost ([127.0.0.1]:59147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tncQB-0000AE-2r for submit@debbugs.gnu.org; Thu, 27 Feb 2025 06:51:19 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:60744) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tncQ8-00009O-34 for 76581-done@debbugs.gnu.org; Thu, 27 Feb 2025 06:51:16 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so7713725e9.1 for <76581-done@debbugs.gnu.org>; Thu, 27 Feb 2025 03:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740657069; x=1741261869; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=9Gf7+Mh67Gw0Ucbw7zbBtK2Gnfyu4aOZafrzrH0PB/Y=; b=kv1OSY20zvHb0Y1UwtE8AflADnlt7O8/RwIg37znMfEMUzQnURl3JqQh5OoClZWAHA fxvFy28k6cVK1YWwq3inlYqGvKekEuAJW6KjMEAqwwGYxwJS+w5y5weI/qk/jYvVvt0Y FdKR4MczGyDdS+eIA8nSwcLCr8XRrh96OZCCgTCw61N1gu9Miqz1zd6fZuCinYmzHllt 1n3Uh7JSqcTihi0etTRI1WLAOh92gdoatm3NwtMAeyj/gyPoCQAmMDck844hChHtsJN2 CNE4/l5spWoPudp52n55IKeNcRhS5FqBtPEViUchyX7cUdA/9w1R835P+4cKB68PfCrl ctoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740657069; x=1741261869; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=9Gf7+Mh67Gw0Ucbw7zbBtK2Gnfyu4aOZafrzrH0PB/Y=; b=UPqoMMBPiAZDG0RQscQo+LN1KlE4BuWOp3POwa2ZwUvi2cLC0uZTcjVLsGyQ85pI62 v9YugJM59J86+YR7TJAG5+phTfeO5bF80BRcHm6U0J9dDNm59jaJUN0l0KHnDitJ6kUK fp05ZCBVKP75/AWbh9ppoj9LWPVBZoU1J+PFBwIdJG5Rlum9p85xK/A+gOTjuf7J5zSJ s2e68orQ19/zjYCJk8Kjyk4UzIrJ4vJIXnzoBlUXJHBz5eNQShJnaGh6G+6Vi2I0R1ff ID0FiGUUScvkQJOmNmBFK7of5TVvWkzM3DiOQStbbQ5jTHfSrzWsKCcHhW3bDn28Vvqb zPeg== X-Gm-Message-State: AOJu0YyLYOozNdexhuBFKGOwZBJMFPIU+fVZNVyduI4KPbOzbqTrvOsG Vd54AX38ZiRzie5i9EtT7bWKioqrMBdWM6nRzgWobFQTwrfvs5sTGhhweA== X-Gm-Gg: ASbGncs3TmAlMjKAqsmatzv+BVG6rrc6poPkaxrSMsktFY+/vD9lDjnEJYcUmnF0dma hleDt05QfSxa32kmd99cMn9DgVKlVgnrP4SgcsLaz6oQN/GZJ5VcEZdqAZbYcVf9GsnicT1rda2 RZHdM4SC1s2YVPFYzRF/JIKYpzAZmgxerhIkJX0mSLHH9sfOT3i+peHgXWHXsfvPPr+fJpjUqTM jW8Khws9nyaAY/OqmGW+CQDPTgfBwiPO0ydnqaI2e5S7jqLsuFsIGx4QzuWgs0tociVi3NkCU+4 hxXWlB+XyFmr16KBV1XccEgtQ0F5s07FjCLj/QyLa86ShHqBqoerL1VnJJ+6jX1iLDYJQkQaqdt rQw== X-Google-Smtp-Source: AGHT+IHLjnYonPZ486ogThhM6c8b8ch6y0EFAckkwL9bJ1hT8rtLQq+M+nP3sC8BE1zTwduTp9yySA== X-Received: by 2002:a05:600c:5106:b0:434:a781:f5d5 with SMTP id 5b1f17b1804b1-43ab903c984mr64456775e9.30.1740657069322; Thu, 27 Feb 2025 03:51:09 -0800 (PST) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43b736f990esm21114335e9.5.2025.02.27.03.51.08 for <76581-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 03:51:08 -0800 (PST) From: Sharlatan Hellseher To: 76581-done@debbugs.gnu.org Subject: [PATCH 0/2] Age: Fix interaction with age.el, add manpages. Date: Thu, 27 Feb 2025 11:51:07 +0000 Message-ID: <87h64ftxlg.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76581-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Pushed to master: 3f6eefdcf28 * master origin/master gnu: age: Install manpages. 05e0793479e * gnu: age: Merge packages with executibles into single one. -- Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJKBAEBCgA0FiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmfAUasWHHNoYXJsYXRh bnVzQGdtYWlsLmNvbQAKCRB21ye/9izStcr2EADQemK8bkOPQxHjGeopsf53gxEj XBy7wxmKlTRHRWgpZeZXuYcM2srlts83Iufc8gJLIieQ3w4vyroKyMfgxptKJar+ vJgpWxvMJF7wOYc1F4Oy4UiqYYj7YLN7kaCOTm4PxWFl66kUP98Q5GUzCRXWPFDF v2bhzKrB7h0nslp2cjMfvjeq6Gd6mnNmH9YxMUg1bJ/d46Gp48Z5drMhUEqEgy1+ 2wIReqcoPJvbVcwJUwlvZAlMqa3dArrhXaY9+qqEuhCEUEwH0DwIp8VYIryN9kcD kKjCcBb/TCMIbCjBJ2UW5W8TEO0xK+uxZc5BxBRGYa/pWkRK+3wrgpbBd0LHt92n ekrRrpJP39nvr46qXgG12VwOeBCbwlN7NxukOJbx3p2pSyJcHepB9T01bxy/pAkB zQcW0qIxUFMZNeqme5EAj8Kil/U+vhAyrhFx0umi2Cu5/OwIHJntTlpZGEpNetZo qFxIZIpZAb9HaEyqNpNEQkblCXeyRgbn1q1t66VjLjLzRzSUQ9sSrMmel3IUim0u CdizX3ERrnciBmCra1Rq2n24dMHJbyXIKAkwPIbTgSl6rHYupwtroq4TrreMzch+ BK1JHkSbPUJhb/67KTINt/UVUqErRks6YMD5000ZtyPyoXYEIZ5hxr+A7GegD8C+ cPEY2q/nrZbsgTq64g== =P1Q7 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 21 12:29:04 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 28 Mar 2025 11:24:16 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator