From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UE81KzFUpWAnKQAAgWs5BA (envelope-from ) for ; Wed, 19 May 2021 20:08:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CDbrJjFUpWB2bAAA1q6Kng (envelope-from ) for ; Wed, 19 May 2021 18:08:49 +0000 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 355C8D37F for ; Wed, 19 May 2021 20:08:49 +0200 (CEST) Received: from localhost ([::1]:37726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljQci-000386-Bp for larch@yhetil.org; Wed, 19 May 2021 14:08:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljQUE-0007MO-Va for bug-guix@gnu.org; Wed, 19 May 2021 14:00:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljQUE-0006Ab-JE for bug-guix@gnu.org; Wed, 19 May 2021 14:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljQUE-0002dd-Iw for bug-guix@gnu.org; Wed, 19 May 2021 14:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#48331: Emacs' describe-package doesn't work for packages managed by guix Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 19 May 2021 18:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48331 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Leo Prikler Received: via spool by 48331-submit@debbugs.gnu.org id=B48331.162144714210041 (code B ref 48331); Wed, 19 May 2021 18:00:02 +0000 Received: (at 48331) by debbugs.gnu.org; 19 May 2021 17:59:02 +0000 Received: from localhost ([127.0.0.1]:60678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljQTG-0002bs-Cg for submit@debbugs.gnu.org; Wed, 19 May 2021 13:59:02 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:34604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljQT9-0002bI-5W for 48331@debbugs.gnu.org; Wed, 19 May 2021 13:59:00 -0400 Received: by mail-qk1-f171.google.com with SMTP id v8so13632846qkv.1 for <48331@debbugs.gnu.org>; Wed, 19 May 2021 10:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=n7K9VOuuX65Swv9GtX88y8FdF9NX61aDrYFsnKITxjc=; b=drwmd1AXLd1yFreVe6unc7nFZ6z7gZn4ADrn3wi45QGF+LldZn0VE9MwPTJ6TS7XiV H3lpi61ZFtfzM9KIL7Z2Y/cdob8w3oM7hF3k13I2gloz90D/G5s1krjDe7M1OHmIUEYI RlEOIg465RlRf4kJjXeoitcEcv1sbv/vJkqbC98+r+VCS/M23Sh5zNuUrLs+4NoEB0BS gcm/4ImPvjr5blIk7mZOcjZqL3ikjZFnAA4/4VETPMYSezdIarCQ7G04mVxRsxoFSSGO RWHbkzFm8QIlLBN4Fsi2la2GGUdi7E+4rHhh3RrBsawOWsrUZlDV4Ron4fbOFyikfd11 Fz0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=n7K9VOuuX65Swv9GtX88y8FdF9NX61aDrYFsnKITxjc=; b=LT3YfZTb/IqSsVdT/waBekChUmLYp8Rrry5j97C8Eh6yY9PeetcfhL0d98HUm/VSQ8 J69lhFKf63jVrBLlRxOhy7ILONSupIVtMkRCbJiPy/i2swNu5RgWrgeU3TNUrsdtCS+x dXVJJPUCHqyyULbit+iCn3yz6z+IF2Dghath7Tm2zDlIx2X5WxVzZHDxnlv9/oL3vmfv tF046MLXDsfCfdBsgTbSAoChFLDs6/VEdpE1qMbjW4jrZ+RLb4BfwRyT1g39dJwUheNO 5y+tJEAAqmtDmB8PRdWpIUX9TzYA9T45wODqRsBt8S56gxz6qq9oy9Lb+AcIuuHCzSeI lhkQ== X-Gm-Message-State: AOAM530WQDUekRO18Wp866wj1KfKz3LD+UrbTYYhE8xcSwNyR6ePE9RJ txI/3/0BGp6MPb5EZxqt0chfRoW+ZINAr6rpAbLuCw== X-Google-Smtp-Source: ABdhPJzBeNZlLhI+DZH6UYVPkcxJZelHb4kB2qqq5j6r8cZGPWJs1cLStCGYfFo+ebSG/I1FJoKv/MA10H96w0G+NGQ= X-Received: by 2002:a37:b643:: with SMTP id g64mr686079qkf.6.1621447129547; Wed, 19 May 2021 10:58:49 -0700 (PDT) MIME-Version: 1.0 References: <87im3r81so.fsf@trop.in> <78cfb495305fb1137da26e37a7ae5dd9467043bf.camel@student.tugraz.at> <8164abe40ec6e865bf8385e010702cfe158dabcc.camel@student.tugraz.at> <6cba9730ace19ecebc397023b243cdb02486cc0c.camel@student.tugraz.at> <437d90a3cc91400fdf0828fea2c989c277a73a7c.camel@student.tugraz.at> In-Reply-To: <437d90a3cc91400fdf0828fea2c989c277a73a7c.camel@student.tugraz.at> From: Andrew Tropin Date: Wed, 19 May 2021 20:58:38 +0300 Message-ID: Content-Type: text/plain; charset="UTF-8" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 19 May 2021 14:08:17 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 48331@debbugs.gnu.org, Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621447729; 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=n7K9VOuuX65Swv9GtX88y8FdF9NX61aDrYFsnKITxjc=; b=fMRRyyl+fLQRg3WQm/M01CERUdtB+yALbLxAqGR3gbR+kbwRVLe57H2BA3oPiwPtmunrwj BKOl5fJxs9L+/TgIEGhPRn2MUjJnp9NMbyiLUuX7923RCg0lhHO4gK3smTCqA7ebI5TKoC qZDVzqO2XmDgDM++izVkU2dlyEY99/iasslwArhpmWY+ZJ3LwyxJPrizkFgYz2wWGDfAZN E4M5k8z+/85vE2Pnd/JjWgo3J5AP6GexVrEKtH4lKMKykBfFkfgD0b7a3o4P+PhcjSjAF6 26BC3TDds1YCjMeB0ePgQgCv3r6r4QCPiTpoGvXjiPNn4Kl+0M1ceEdrBgOn0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621447729; a=rsa-sha256; cv=none; b=UqCDoeh6BHD1qWDTsCf3X1k89JK6sNK4HdoZ37Z+fNpb2ikRJmTjb/rMqb0KLS6qPIAEKh 05yVeG+niHLoIhf1DWspaMAl+BHxdSO2D/a7eTKr0etaHxoG3SNn28bJaT/6hvdl0xNdrN kM6Wfw0rwOy5s8+DmqgejY0roGFPizATBQqLQEtZqX11Rh19oLCmSY56HUR4vsek4yoXLs P/IAppxfI9ayUfOfwAlB5dnO++24YxU5AJoTKKQt+lTYi1enNGVj+0c/ssH5jPFOJiNR6/ OmUucONP0cFSN2QR2hfD7Qvqy0A4sb/cKhMhA+bPgmXYbNnpfDmiUmbkPFFEpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=drwmd1AX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.44 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=drwmd1AX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 355C8D37F X-Spam-Score: -1.44 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZQpdMf69jFPp From: Andrew Tropin Date: Wed, 19 May 2021 20:44:22 +0300 Subject: [PATCH] guix: build: emacs-build-system: Make package.el aware of guix packages After updating the package-directory-list variable, functions like list-packages, describe-package become aware of packages installed by guix. --- This code is getting work done, but I'm not a very experienced elisp developer, so please review it thoroughly. gnu/packages/aux-files/emacs/guix-emacs.el | 10 ++++++++++ guix/build/emacs-build-system.scm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index ca9146c535..4aa4220cda 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -58,6 +58,16 @@ The files in the list do not have extensions (.el, .elc)." (load f 'noerror)) autoloads))) + +(require 'package) + +;; Set `package-directory-list' to the value without elpa/ suffix +;; to match the structure of site-lisp directory of guix's emacs +;; build system. +;;;###autoload +(setq package-directory-list + (list (string-remove-suffix "/elpa" (car package-directory-list)))) + (provide 'guix-emacs) ;;; guix-emacs.el ends here diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index e41e9a6595..7565b9a422 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -53,7 +53,7 @@ ;; These are the default inclusion/exclusion regexps for the install phase. (define %default-include '("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$")) -(define %default-exclude '("^\\.dir-locals\\.el$" "-pkg\\.el$" +(define %default-exclude '("^\\.dir-locals\\.el$" "^[^/]*tests?\\.el$")) (define gnu:unpack (assoc-ref gnu:%standard-phases 'unpack)) -- 2.31.1