From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qEnSMe6j6mE4SwAAgWs5BA (envelope-from ) for ; Fri, 21 Jan 2022 13:15:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aN5JLu6j6mG1dwEAauVa8A (envelope-from ) for ; Fri, 21 Jan 2022 13:15:42 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 11CBE30D25 for ; Fri, 21 Jan 2022 13:15:42 +0100 (CET) Received: from localhost ([::1]:41546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAspR-0003Ia-6A for larch@yhetil.org; Fri, 21 Jan 2022 07:15:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAslu-0008HI-82 for guix-patches@gnu.org; Fri, 21 Jan 2022 07:12:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAslt-0007Pe-SP for guix-patches@gnu.org; Fri, 21 Jan 2022 07:12:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nAslt-0007Av-Oa for guix-patches@gnu.org; Fri, 21 Jan 2022 07:12:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52388] [PATCH] build-system: emacs: Add generation of -pkg.el files. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jan 2022 12:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52388 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 52388@debbugs.gnu.org Cc: Ivan Sokolov Received: via spool by 52388-submit@debbugs.gnu.org id=B52388.164276711127563 (code B ref 52388); Fri, 21 Jan 2022 12:12:01 +0000 Received: (at 52388) by debbugs.gnu.org; 21 Jan 2022 12:11:51 +0000 Received: from localhost ([127.0.0.1]:60513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAsli-0007AT-RY for submit@debbugs.gnu.org; Fri, 21 Jan 2022 07:11:51 -0500 Received: from mail-lf1-f41.google.com ([209.85.167.41]:34417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAslf-0007AD-GB for 52388@debbugs.gnu.org; Fri, 21 Jan 2022 07:11:49 -0500 Received: by mail-lf1-f41.google.com with SMTP id p27so33415082lfa.1 for <52388@debbugs.gnu.org>; Fri, 21 Jan 2022 04:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=Fmjf5u1sVtHPNmFYAcIoI9bcf0CJUCsdoIIpEWa2lB8=; b=fBQJ8FE9Doo66KInsVLWlJuW5J/sc6kCGxyBlc6XvbtRK0h/DXXnXzxfQD5srYxc1M vCxd+KcSdRPpewcaYe35zA8RTPE1r4BHCDi2xUXMth+udqwi+96A3LO0LVlO/oYLWXDM elb+JlgOKEDb1XQJoEdegsiQeccvuyBredLw9chT1J+jQAJAU1fHBZDI4vfhtKHtrPG/ rya6RZbP1uRk32k/zxGMx/2rLpq5XZGZNLt6FjmGgqp8KGM/WgrehgzxzisY0yQ7nlXY Vh/ZoXX8msVLjLjpOonlzwV9dVvjEpfF0d6tc+LZAqX/jXLfFmM1XdWq5iU0VH4bn1jT x1gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=Fmjf5u1sVtHPNmFYAcIoI9bcf0CJUCsdoIIpEWa2lB8=; b=0HEZ3u4Z3Np9p0/oWHstyXeheb6TdL4NAWO9H6hLlIhF2d77anpeu8ts/Z/uGlA/eg BcOcuzc7lSYR7j2qlf6Odqw8Iepm98HN+wAnh+pXHlXZVC5fvyEikTeg8usjY2lsFNZi OHm+xtLSNZckiNX+LaXxTV17Iw3NChOvs+/qXLnk1VQ5901bk3hiu9iXkyQZijp3gN8p vNmogd8LLEq7TH5eWjcHR2eo+fVV0NProMdGDmysIVvvWCmvblljXcde9qt748IO0mnA f6n5m4uFOjS3DePBiV96Hzd1OHrZQIS5OpyIQ7DO4X/oE2UAC4Ru1oW9KOwZiM/mxBbZ TYAg== X-Gm-Message-State: AOAM533bS4+iZLp1JP2wiNzkXpBvAqkj2jvgUerJ6UxGfotC74Hnvv5H V2D+K6wLY/S8uzkSpV1K5QrkgA== X-Google-Smtp-Source: ABdhPJwvv9pq+d2aVj2wMt55YhBt0sPal6DMZsQGJ6kBQr4gC19of/p5aFhMJOrM+kTHKlfk3uOpgA== X-Received: by 2002:a05:6512:10cc:: with SMTP id k12mr3549649lfg.425.1642767101090; Fri, 21 Jan 2022 04:11:41 -0800 (PST) Received: from localhost (109-252-135-33.dynamic.spd-mgts.ru. [109.252.135.33]) by smtp.gmail.com with ESMTPSA id l22sm174809ljg.78.2022.01.21.04.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 04:11:40 -0800 (PST) From: Andrew Tropin In-Reply-To: <80cfa468ef91649dce477779a70d3a8ce64fd0e4.camel@gmail.com> References: <871r2mrleb.fsf@trop.in> <80cfa468ef91649dce477779a70d3a8ce64fd0e4.camel@gmail.com> Date: Fri, 21 Jan 2022 15:11:36 +0300 Message-ID: <87zgnp8f0n.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642767342; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Fmjf5u1sVtHPNmFYAcIoI9bcf0CJUCsdoIIpEWa2lB8=; b=PBeJyXSpE6Zu2IdJCCXcpFRbMZCA7Biys8P/Z4ztHzmnvYsBETB5w8KZOHzaMFX1/lKA2r BGo79LsfmUgFVxUWex/K4ndxQCW2t1Zgg2+5CaKqMeuFCQKUoqT+QRyPTSlWQOahn2fThe aHy5IGub3rUJGQ8iXc5Qiswq1C0Z2N8jWEILo3pEY8M7SodW80jVvJ3V7jTucP0+aSJrr+ 6K1ZOD4EyyBRtkNmne8/w1xn4SwD/hW6UtkIeagxOguSGZGXAER7v8BJtCji8WCZbokaEn MhyuMiGHsTR8rpASdr0P7svipGOElkX0IDEMuNexk+wE5jOvJoLuVmeu3g68eA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642767342; a=rsa-sha256; cv=none; b=EzEdrxAPNnzasMJeAx/+3RKTWzsx03roBsZllesbtAbQ2UBjo1QjmZ68/hNjWjLNr5vE88 ebEj2E/SP9gY6BvYtRGtBMZ0a5AsbXc05EQQpjEy77ILDlYmaNxo1aX2AvIUMgzDp7IqMf UsBWwA4fDuzyO3bICMywMWvk1/qXsfzobAYvI3GGDhU/LjnChnvERQewPKLvs1Oh153ALl cv2SEqxfmecqrfzwDpfcel+6ycAwMmdAB7BMk+Mn/zMbmfCd8BIiAEjU4iMCyyRXiM2jnS pWQdtDXQNsAK6NDlwONQFnGED/xnAqEcQpA55ieaTLP/jDIevrPrmNYcR7k35A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=fBQJ8FE9; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20210112.gappssmtp.com header.s=20210112 header.b=fBQJ8FE9; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 11CBE30D25 X-Spam-Score: -4.22 X-Migadu-Scanner: scn1.migadu.com X-TUID: JiE+qYpOLOFh --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-01-14 21:56, Liliana Marie Prikler wrote: > Hi Andrew, > > Am Donnerstag, dem 09.12.2021 um 12:01 +0300 schrieb Andrew Tropin: >>=20 >> * guix/build/emacs-build-system.scm (%default-exclude): Add >> generation of >> -pkg.el files for packages, which do not provide them. >> --- >> Implemented phase, which generates -pkg.el from comments in library >> file.=C2=A0 The solution for finding main el file of the package is a >> little hacky, because package name isn't available build time. >>=20 >> I took a part of the elisp implementation from melpa source code. >> https://github.com/melpa/melpa/blob/master/package-build/package-build.e= l#L553 > As promised, I took a deeper look at your patch. As already noted, > there were some clean-up actions I had to perform, such as keeping to > our line limit (it was not easy, I tell you) among other things. Also, > confusingly, your condition-case code did not handle errors and wrong > handling of the version field blew up everything for me. Did you test > this code? I thought it was the version I used for past a few weeks, however I could send a little outdated version, not the latest one by accident. Tested it with guix build emacs-paredit. See your fix which wraps both forms in one let, thank you, yep, it's very likely I sent an intermediate version of the patch accidentially. > > In any case, attached is my revised patch. I so far only checked it > with emacs-olivetti -- a package whose description is missing in > current Guix Emacs. I'll give everyone some time to test things before > pushing this however; I don't want to break a bunch of Emacs packages > scattered around various files. > > Cheers > From 9fa6a09a131cfe436ca053c960ed9625263bc650 Mon Sep 17 00:00:00 2001 > From: Andrew Tropin > Date: Thu, 9 Dec 2021 12:01:46 +0300 > Subject: [PATCH] build-system: emacs: Ensure that package descriptions are > generated. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > This patch addresses the second part of . > While existing -pkg.el files were previously installed, no such files > were generated for packages lacking them, resulting in packages not > being listed as installed and not being available towards > =E2=80=9Cdescribe-package=E2=80=9D. > > * guix/build/emacs-build-system.scm (find-root-library-file) > (ensure-package-description): New variables. > (%standard-phases): Add =E2=80=98ensure-package-description=E2=80=99. > --- > guix/build/emacs-build-system.scm | 77 ++++++++++++++++++++++++++++++- > 1 file changed, 76 insertions(+), 1 deletion(-) > > diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-s= ystem.scm > index ab77e57f33..58d2a9b9f4 100644 > --- a/guix/build/emacs-build-system.scm > +++ b/guix/build/emacs-build-system.scm > @@ -140,6 +140,79 @@ (define (substitute-program-names) > (substitute-program-names)))) > #t)) >=20=20 > +(define (find-root-library-file name) > + (let loop ((parts (string-split > + (package-name-version->elpa-name-version name) #\-)) > + (candidate "")) > + (cond > + ;; at least one version part is given, so we don't terminate "early" > + ((null? parts) #f) > + ((string-null? candidate) (loop (cdr parts) (car parts))) > + ((file-exists? (string-append candidate ".el")) candidate) > + (else > + (loop (cdr parts) (string-append candidate "-" (car parts))))))) > + > +(define* (ensure-package-description #:key outputs #:allow-other-keys) > + (define (write-pkg-file name) > + (define summary-regexp > + "^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?= $") > + (define %write-pkg-file-form > + `(progn > + (require 'lisp-mnt) > + (require 'package) > + > + (defun build-package-desc-from-library (name) > + (package-desc-from-define > + name > + ;; Workaround for malformed version string (for example "24 (= beta)" > + ;; in paredit.el), try to parse version obtained by lm-versio= n, > + ;; before trying to create package-desc. Otherwis the whole = process s/Otherwis/Otherwise, > + ;; of generation -pkg.el will fail. > + (condition-case > + nil > + (let ((version (lm-version))) > + ;; raises an error if version is invalid > + (and (version-to-list version) version)) > + (error "0.0.0")) > + (or (save-excursion > + (goto-char (point-min)) > + (and (re-search-forward ,summary-regexp nil t) > + (match-string-no-properties 1))) > + package--default-summary) > + (let ((require-lines (lm-header-multiline "package-requires")= )) > + (and require-lines > + (package--prepare-dependencies > + (package-read-from-string > + (mapconcat 'identity require-lines " "))))) > + :kind 'single > + :url (lm-homepage) > + :keywords (lm-keywords-list) > + :maintainer (lm-maintainer) > + :authors (lm-authors))) > + > + (defun generate-package-description-file (name) > + (package-generate-description-file > + (build-package-desc-from-library name) > + (concat name "-pkg.el"))) > + > + (condition-case > + err > + (let ((name (file-name-base (buffer-file-name)))) > + (generate-package-description-file name) > + (message (concat name "-pkg.el file generated."))) > + (error > + (message "There are some errors during generation of -pkg.el f= ile:") > + (message "%s" (error-message-string err)))))) > + > + (unless (file-exists? (string-append name "-pkg.el")) > + (emacs-batch-edit-file (string-append name ".el") > + %write-pkg-file-form))) > + > + (let* ((out (assoc-ref outputs "out")) > + (elpa-name-ver (store-directory->elpa-name-version out))) > + (with-directory-excursion (elpa-directory out) > + (and=3D> (find-root-library-file elpa-name-ver) write-pkg-file)))) > + > (define* (check #:key tests? (test-command '("make" "check")) > (parallel-tests? #t) #:allow-other-keys) > "Run the tests by invoking TEST-COMMAND. > @@ -279,8 +352,10 @@ (define %standard-phases > (add-after 'make-autoloads 'enable-autoloads-compilation > enable-autoloads-compilation) > (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-fi= les) > + (add-after 'patch-el-files 'ensure-package-description > + ensure-package-description) > ;; The .el files are byte compiled directly in the store. > - (add-after 'patch-el-files 'build build) > + (add-after 'ensure-package-description 'build build) > (add-after 'build 'validate-compiled-autoloads validate-compiled-aut= oloads) > (add-after 'validate-compiled-autoloads 'move-doc move-doc))) Looks cleaner than original implementation, thank you!) Applied on my local checkout of guix channel, list-packages now shows 117 external packages =3D) Will keep it for a while and let you know if any problems will reveal themselves. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmHqovgPHGFuZHJld0B0 cm9wLmluAAoJECII0glYwd6wkMYP/0iXSEI7Ky+K5zLUtktYmUrmxSUS34LlnQyU Ld/0P0o9gE3KF4kEko3Yehvu1CHpaK46v/9xN1E34Q10Cxa4eA+l6N9c9IFRnzdZ QIbj+RFDKEyKqSluHcGFQY+JXCM7Q8579t/dxAQkiErFSbRHBO3D6bBZRmEJSRBp KHP3p2nHfTlr97BTBczJl5ZCP4aW6ijM3RtfVQiQntKws3liJbn0aDZGXslskmVA Q4Ct68DQLRjjnKAbh3IK8G1pbLjzi22MdtI1QgdZ51Q7U+IRROqlf5SUOE3uA0Ue DI9TWu1Yx5S+y/pwWjtZqsiYTIpcXq0P8uQkM1P8mSLQq571wPW+ZrWtgMXX2cjc 0gDvtL/P8TKzNpiAfBFdCtRi669d27Kerqy5frUE3BFAaqMk2SPxA44w7A3ZTWrr ZAp9H52GPafS9X3GQNeOw2KXitpy773jw3t1VVc/hYe+UuszJj55qkU3oD7gv4Mw meGq21dmZrQuv+MF6bXFM/9W1OIYZmcGJNbY+fQI3JEEduuVaUxHBuTBAqG6qHFY An6cqt95P3tsoj58jssJJiT8fyqlp0OYGUyKl22Ur78SQAevp6sy46F32XAbP81S a1/TrRqKCWYCvt5a5LCfHEu8cFjFh7WnF3t9cO/mm1lC5PzzQ1fIXETtzsp+bV+r ZbOPCW2E =5NYX -----END PGP SIGNATURE----- --=-=-=--