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 SLZ0CrAfjGHuhQEAgWs5BA (envelope-from ) for ; Wed, 10 Nov 2021 20:38:24 +0100 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 uAExBrAfjGGpHwAA1q6Kng (envelope-from ) for ; Wed, 10 Nov 2021 19:38:24 +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 31901145BB for ; Wed, 10 Nov 2021 20:38:23 +0100 (CET) Received: from localhost ([::1]:32886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mktQM-0003rD-B1 for larch@yhetil.org; Wed, 10 Nov 2021 14:38:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mktQ2-0003pG-Dn for guix-patches@gnu.org; Wed, 10 Nov 2021 14:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mktQ1-0006tO-Pv for guix-patches@gnu.org; Wed, 10 Nov 2021 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mktQ1-0005mT-OU for guix-patches@gnu.org; Wed, 10 Nov 2021 14:38:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51755] [PATCH 1/1] gnu: proof-general: Adjust autoloads for Emacs. References: <20211110192622.368232-1-zimon.toutoune@gmail.com> In-Reply-To: <20211110192622.368232-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Nov 2021 19:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51755 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51755@debbugs.gnu.org Cc: zimoun Received: via spool by 51755-submit@debbugs.gnu.org id=B51755.163657307922209 (code B ref 51755); Wed, 10 Nov 2021 19:38:01 +0000 Received: (at 51755) by debbugs.gnu.org; 10 Nov 2021 19:37:59 +0000 Received: from localhost ([127.0.0.1]:39222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mktPy-0005m9-QU for submit@debbugs.gnu.org; Wed, 10 Nov 2021 14:37:59 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:35834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mktPw-0005lr-Pk for 51755@debbugs.gnu.org; Wed, 10 Nov 2021 14:37:57 -0500 Received: by mail-wr1-f49.google.com with SMTP id i5so5933168wrb.2 for <51755@debbugs.gnu.org>; Wed, 10 Nov 2021 11:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wjdpagCUF3lYU18RbKLtY+yYfRZnDSuruXLHYUnEBjo=; b=qe53g1Sag//yaNn8SBfKUuYuwMVedof7bsi32eXqgPGnigfqkHAbpWwZUDR99OfKL7 QM6Em1vc78fyhihoSPHf1W3FbPiIh1468l1Hs5WKY63ZMqUBrgaEKHUVORkofa7+nRhy BF+5sJaiizhyXuf89k3Za7Ig5vT4r8jGqfp4qs9Gm+yQQoualp0nEk1vbIBXUaWeEEUW ENWyNeG6TgMiglutqs5OlJkEddEhlzrg7vCXq1LGDEZfx9hsUjTX5+EiHX56HYakkGG9 8YBLQTB3nkyhh75ctWSg84L5BUUuT7wj2Df8iTPnDl368Mrb+FDMWgbKBcB0lDQBaRK1 M3kw== 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:date:message-id:mime-version :content-transfer-encoding; bh=wjdpagCUF3lYU18RbKLtY+yYfRZnDSuruXLHYUnEBjo=; b=OfDCN5RFYH5PRiRfj33Hzvs/62A42p7EdvNMAcw7J3TZEidPq9qgSp4uAO7jXXnHxN kIi/6jHeeilv2BBSy/5HIYc0zM7dCjqr5xrvmFvlRbjZZHeE3Hfoj3iRGa9zRzcIU4tL Ttg9qjhslXkI3TJRewuVaXLvnQZ1GX9B9R3uFc142RZ0dcBX5yV12BFFVkRwpL8q2b+r i/6vBHGLry5I7i0QULgUE7JYEJp1b8cC9baOiL2ObJ6tYOFC8LVBT6XuAVZz9NjSj7KJ hpDuAdvrYXJySPNCw2PihYY3vpKTDQ0GrslpsK62Rn7R9dfbjEpNDpIiJOhnpJGhqGB9 ZABg== X-Gm-Message-State: AOAM533VneYa0pQE3ckfKZFkfo9hDPSu1KgK0oCfw2+0552RQURvyQ3o Ui7smJAfviRATK1NIUs0ajsiSjEQFeM= X-Google-Smtp-Source: ABdhPJwQZ1HcHDUHpHacvzko62Ks64XlTWFIJy+cr5jlByEX41RFLna62F2og7mj9ElKNkggu3C1ww== X-Received: by 2002:a05:6000:1688:: with SMTP id y8mr1862126wrd.420.1636573070864; Wed, 10 Nov 2021 11:37:50 -0800 (PST) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id w10sm703638wrq.88.2021.11.10.11.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 11:37:50 -0800 (PST) From: zimoun Date: Wed, 10 Nov 2021 20:37:48 +0100 Message-Id: <20211110193748.368696-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636573103; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=wjdpagCUF3lYU18RbKLtY+yYfRZnDSuruXLHYUnEBjo=; b=ihrRQWUeRT9RJICwWkcnKTXBaC6KXMKHTvC6r5iRT2aHIZ/IVFU7bPQ2HLja4t/jsUJ9rS m0doMbUL9N7Sr1fYl9qGXsvRgP9FG8fyog5kl3irt834+KaPQ6EwLitBJJzwCdmZAvHp8n k0BxFUHQ42wjebNyxgXTWjfuwo7l7zfCg1GbEwuFrG4tfuRt71yoNcYf3AvxFy4DC4XS2c UH18E5NkMlbi5AOzCu8mKl5YxoAGYKAGdG972R/gq6YoOHT7wsJBYa+KqT6PXTkNDie9SD 0eFm9vyEHqqzCmyJGQVxsG4OU31MZAucfKKP22jBzvjG6diJHfJ0Tqr4jfD5/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636573103; a=rsa-sha256; cv=none; b=WosCmMlKNnMSJHWWtj2CLrD7ysumwPfYDQtCBGMGZirZ7qjF+AAyJ2cz/3Cq1N/eD0X9sX v816cvPvMGMoUvVh8e5GwRPMmaMNAYzvKqZ9rUpvx3l3tpzpBty9CZBzxwUrJdm/bn/fc8 NbmVZXapV5/1Za38sJ5HDM19xguPTSPQdvGLolGQyomUWAF2POofXdLMan6p+Fx2wItkoj 2Sj5jDsEIwEy//KNfh6fqMPnf7O9OnTu4denXnQlNlihyFebecFZVYILbnsmmB+7l0GXX8 EgORaJzGyGf6mB5m/3Hh2o+UjmAenm6TS6EQqDc2yqk0K4di4UWV18i4G2rlNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qe53g1Sa; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=qe53g1Sa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 31901145BB X-Spam-Score: 2.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: X9GPt8qR+QTA Fixes . * gnu/packages/coq.scm (proof-general)[native-inputs]: Remove 'which'. [inputs]: Remove 'coq' and 'emacs'. [arguments]<#:make-flags>: Adjust to find 'emacs'. Set 'ELISP' and 'DEST_LISP'. <#:modules, #:imported-modules>: Remove. <#:phases>: Remove call to 'which' in Makefile. Add copy file allowing Emacs autoloads. Clean unnecessary code. --- gnu/packages/coq.scm | 85 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index dccb9bea4c..2cf9d1a602 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -135,50 +135,55 @@ (define-public proof-general "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa")))) (build-system gnu-build-system) (native-inputs - `(("which" ,which) - ("emacs" ,emacs-minimal) + `(("emacs" ,emacs-minimal) ("texinfo" ,texinfo))) (inputs - `(("host-emacs" ,emacs) - ("perl" ,perl) - ("coq" ,coq))) + `(("perl" ,perl))) (arguments - `(#:tests? #f ; no check target - #:make-flags (list (string-append "PREFIX=" %output) - (string-append "DEST_PREFIX=" %output) - (string-append "ELISP_START=" %output - "/share/emacs/site-lisp/ProofGeneral")) - #:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'disable-byte-compile-error-on-warn - (lambda _ - (substitute* "Makefile" - (("\\(setq byte-compile-error-on-warn t\\)") - "(setq byte-compile-error-on-warn nil)")))) - (add-after 'unpack 'patch-hardcoded-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coq (assoc-ref inputs "coq")) - (emacs (assoc-ref inputs "host-emacs"))) + (let ((base-directory "/share/emacs/site-lisp/ProofGeneral")) + `(#:tests? #f ; no check target + #:make-flags (list (string-append "PREFIX=" %output) + (string-append "EMACS=" (assoc-ref %build-inputs "emacs") + "/bin/emacs") + (string-append "DEST_PREFIX=" %output) + (string-append "ELISP=" %output ,base-directory) + (string-append "DEST_ELISP=" %output ,base-directory) + (string-append "ELISP_START=" %output ,base-directory)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'disable-byte-compile-error-on-warn + (lambda _ + (substitute* "Makefile" + (("\\(setq byte-compile-error-on-warn t\\)") + "(setq byte-compile-error-on-warn nil)")))) + (add-after 'unpack 'patch-hardcoded-paths + (lambda _ + (substitute* "Makefile" + (("/sbin/install-info") "install-info")))) + (add-after 'unpack 'remove-which + (lambda _ + (substitute* "Makefile" + (("`which perl`") "perl") + (("`which bash`") "bash")))) + (add-after 'unpack 'clean + (lambda _ + ;; Delete the pre-compiled elc files for Emacs 23. + (invoke "make" "clean"))) + (add-after 'install 'install-doc + (lambda* (#:key make-flags #:allow-other-keys) + ;; XXX FIXME avoid building/installing pdf files, + ;; due to unresolved errors building them. (substitute* "Makefile" - (("/sbin/install-info") "install-info"))))) - (add-after 'unpack 'clean - (lambda _ - ;; Delete the pre-compiled elc files for Emacs 23. - (invoke "make" "clean"))) - (add-after 'install 'install-doc - (lambda* (#:key make-flags #:allow-other-keys) - ;; XXX FIXME avoid building/installing pdf files, - ;; due to unresolved errors building them. - (substitute* "Makefile" - ((" [^ ]*\\.pdf") "")) - (apply invoke "make" "install-doc" make-flags)))))) + ((" [^ ]*\\.pdf") "")) + (apply invoke "make" "install-doc" make-flags))) + (add-after 'install 'allow-subfolders-autoloads + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Make it visible by Emacs + (copy-file "proof-general.el" + (string-append out ,base-directory + "/proof-general-autoloads.el"))))))))) (home-page "https://proofgeneral.github.io/") (synopsis "Generic front-end for proof assistants based on Emacs") (description -- 2.33.1