From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cPxGKWA1mGKHOQEAbAwnHQ (envelope-from ) for ; Thu, 02 Jun 2022 05:58:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iB0sKWA1mGLmGQAAauVa8A (envelope-from ) for ; Thu, 02 Jun 2022 05:58:24 +0200 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 3F6F724E5B for ; Thu, 2 Jun 2022 05:58:24 +0200 (CEST) Received: from localhost ([::1]:48126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwbyY-0006XG-Ak for larch@yhetil.org; Wed, 01 Jun 2022 23:58:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwbyE-0006X7-Rj for bug-guix@gnu.org; Wed, 01 Jun 2022 23:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwbyE-0006Xw-JD for bug-guix@gnu.org; Wed, 01 Jun 2022 23:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwbyE-0005AD-BB for bug-guix@gnu.org; Wed, 01 Jun 2022 23:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55495: [PATCH v3] gnu: emacs-haskell-mode: Fix build. References: <87o7zvtf8z.fsf@taiju.info> In-Reply-To: <87o7zvtf8z.fsf@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 02 Jun 2022 03:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55495 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 55495@debbugs.gnu.org Cc: Taiju HIGASHI Received: via spool by 55495-submit@debbugs.gnu.org id=B55495.165414227119831 (code B ref 55495); Thu, 02 Jun 2022 03:58:02 +0000 Received: (at 55495) by debbugs.gnu.org; 2 Jun 2022 03:57:51 +0000 Received: from localhost ([127.0.0.1]:52290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwby2-00059m-6T for submit@debbugs.gnu.org; Wed, 01 Jun 2022 23:57:51 -0400 Received: from mail-pf1-f174.google.com ([209.85.210.174]:42974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwbxz-00059S-H6 for 55495@debbugs.gnu.org; Wed, 01 Jun 2022 23:57:48 -0400 Received: by mail-pf1-f174.google.com with SMTP id 187so3681244pfu.9 for <55495@debbugs.gnu.org>; Wed, 01 Jun 2022 20:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MM//WGaoeHc420MyaSk4ZysL5Ozw6ewd1ydAzbiazYE=; b=LyIRElEzcoL81mn9SQO2/ZQu5De1aCgwZYcSsBDpFjgzgf5K1OToe4VyzyKFQqbVIr HFfyQfMf1ZaPFVdN+WIDXufG/CcKU6LRTfwKhIes86Ye7WyaZvLD/+N7/xiFkEAkuT1a eUsufPsJbJQoxmpG9zGL9fU7zImwmOvDLXoqDqeVUliOOuwHd0ieDRTzAKAhHOrV8d+E BqmcG5aGv8EQT6Kd2cSGGEIvDN8pQ/SLd9YEB/e0hHc7+RKi2yTjxnk6Z8/ZXpmnUsF2 xLdDhDB3Q4+g0BtiRKLh9yVPaIVjRYU4crNvF1+Szm5tbkOG5BpcrtoSNrppZjay56zw rilA== 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=MM//WGaoeHc420MyaSk4ZysL5Ozw6ewd1ydAzbiazYE=; b=MqV5kG+xuIeELYq+PbgWn+JcsLOMKHk4JnsJ5CDmD4QPvuLLjU0icJI1iiCHMYyn3B eDMRuHO2dlqBkjtItCmVTvg2BOnbW77OxfsBB/GR5Jfl48T53P+D6MtEP2jmqpCezsQl QJjrgQvu8MURzihzl0UgWuFQOTXnApVox8I0NGE3uYw8jhhmacvpvN9XuRGDl/bfTNJL cOqTrLyLA04ZrUgicgCSgOwkjRYONjMv/Wh+owtdQ8k81vjZg+DUlnR0fT+vDFU5yIs+ 5o4XGhSxJQhyZVxHljSrowI48mADJyAU/1XbLS7j77jOkriAhH3CeJahmwfZxZLkNjcw mgSQ== X-Gm-Message-State: AOAM530OQDJ9UV5nFFBqOkPQYt8p32fUuKc9hCmwmjI6dyUzHPTP6ur8 DJ3HW068Ug/ST2+2Iaw7XCf89QbnLCseCr0k X-Google-Smtp-Source: ABdhPJyt2I2CXLICs9OWxwhTqGzADNvuNA5oJRI9DHfjHq5GPftV8uiX+T3IVEFTGwq8EVpsoeZLEQ== X-Received: by 2002:a05:6a00:1487:b0:518:b952:8894 with SMTP id v7-20020a056a00148700b00518b9528894mr2948531pfu.73.1654142261048; Wed, 01 Jun 2022 20:57:41 -0700 (PDT) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id v63-20020a638942000000b003f9d1c020cbsm2137217pgd.51.2022.06.01.20.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 20:57:40 -0700 (PDT) From: Taiju HIGASHI Date: Thu, 2 Jun 2022 12:57:22 +0900 Message-Id: <20220602035722.18022-1-higashi@taiju.info> X-Mailer: git-send-email 2.36.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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654142304; 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=MM//WGaoeHc420MyaSk4ZysL5Ozw6ewd1ydAzbiazYE=; b=eCY0+2A97eR7orDDg27/vpkCRmki2XrwIWSMVy3V/xO8bqWVFgqkIloAkH9jRfPMGJw7Ya N9bK4Ofc47KeAw4fqt3Yz00sffUA2ArC5DEqfcrHFDAK704+3SFdu8yAS6Jfw2k1xNpBVi jsEhkyK+xtc+HhdH1gkQU82hAF8N3kSlIn76EC7emdh1Xc5yb0iEXpj8VIyzYRNX9ukpLe O1SBRuRw0rjS15Hec+XH46GjQiAv/GRxIqh/S83OExP8NoanTSn5X6yJS+1bQd5trwpEX4 UeeyarflnWjY3Fp83MQP4CDZIlJlsSipM+oMALybML6vTCDyYRqWodtwcHUsVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654142304; a=rsa-sha256; cv=none; b=K3aA0fgVks9bBZykMqt37VzjP9bQRDwiTO+l8Hh+HkrrszAUGgpT3OXG1Lf0xagX35LVfN R/Z/X3b5sXUL51TxbeJGbXOFkK+48HquVu2LgtVBCMhQX1iZNmvFu0dLWWpPa9VFx6OYEz obdkbvsXZUHIrOC3UQAzFwwy8Pdb+e7Fq+01Vlnk+U4YcTf3d5KL/aFWs8PRz4PmRWtr+L OIfcDtgABtWjw6ZqapAzq0CcLy88AUTcVAKxtyP+9SVkrN4Rti1jyNgGI9+qhrr8vxBDv3 /yLVlXoyxw4YGRl0RW0WVBEGNcv0BpPD3m5Gbnd3p88jAPMuAia/VY2zPChkiw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=LyIRElEz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=LyIRElEz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3F6F724E5B X-Spam-Score: 1.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: R/NMMJBXfaCd * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Fix build. --- gnu/packages/emacs-xyz.scm | 179 +++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 85 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ced6e1a482..3552cdc7c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1571,92 +1571,101 @@ (define-public emacs-unpackaged-el (license license:gpl3+)))) (define-public emacs-haskell-mode - (package - (name "emacs-haskell-mode") - (version "17.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haskell/haskell-mode") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")))) - (propagated-inputs - (list emacs-dash)) - (native-inputs - (list emacs-minimal emacs-el-search emacs-stream texinfo)) - (build-system gnu-build-system) - (arguments - (list - #:make-flags #~(list - (string-append "EMACS=" #$emacs-minimal "/bin/emacs")) - #:modules `((ice-9 match) - (srfi srfi-26) - ((guix build emacs-build-system) #:prefix emacs:) - ,@%gnu-build-system-modules) - #:imported-modules `(,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - (define (el-dir store-dir) - (match (find-files store-dir "\\.el$") - ((f1 f2 ...) (dirname f1)) - (_ ""))) - - (let ((sh (search-input-file inputs "/bin/sh"))) - (define emacs-prefix? (cut string-prefix? "emacs-" <>)) - - (setenv "SHELL" "sh") - (setenv "EMACSLOADPATH" - (string-concatenate - (map (match-lambda - (((? emacs-prefix? name) . dir) - (string-append (el-dir dir) ":")) - (_ "")) - inputs))) - (substitute* (find-files "." "\\.el") (("/bin/sh") sh))))) - (add-before 'check 'delete-failing-tests - ;; XXX: these tests require GHC executable, which would be a big - ;; native input. - (lambda _ - (with-directory-excursion "tests" - ;; File `haskell-indent-tests.el' fails with - ;; `haskell-indent-put-region-in-literate-2' - ;; on Emacs 27.1+ - ;; XXX: https://github.com/haskell/haskell-mode/issues/1714 - (for-each delete-file - '("haskell-indent-tests.el" - "haskell-customize-tests.el" - "inferior-haskell-tests.el"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (el-dir (emacs:elpa-directory out)) - (doc (string-append - out "/share/doc/haskell-mode-" #$version)) - (info (string-append out "/share/info"))) - (define (copy-to-dir dir files) - (for-each (lambda (f) - (install-file f dir)) - files)) - - (with-directory-excursion "doc" - (invoke "makeinfo" "haskell-mode.texi") - (install-file "haskell-mode.info" info)) - (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) - (copy-to-dir el-dir (find-files "." "\\.elc?")))))))) - (home-page "https://github.com/haskell/haskell-mode") - (synopsis "Haskell mode for Emacs") - (description - "This is an Emacs mode for editing, debugging and developing Haskell + (let ((commit "5a9f8072c7b9168f0a8409adf9d62a3e4ad4ea3d") + (revision "0")) + (package + (name "emacs-haskell-mode") + (version (git-version "17.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0np1wrwdq7b9hpqpl9liampacnkx6diphyk8h2sbz2mfn9qr7pxs")))) + (propagated-inputs + (list emacs-dash)) + (native-inputs + (list emacs-minimal emacs-el-search emacs-stream texinfo)) + (build-system gnu-build-system) + (arguments + (list + #:make-flags #~(list + (string-append "EMACS=" #$emacs-minimal "/bin/emacs")) + #:modules `((ice-9 match) + (srfi srfi-26) + ((guix build emacs-build-system) #:prefix emacs:) + ,@%gnu-build-system-modules) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Suppresses problems with git commands being called and tests + ;; failing. + (substitute* "tests/haskell-mode-tests.el" + (("\\(require 'haskell-test-utils\\)" all) + (string-append all " (setq vc-handled-backends nil)"))))) + (delete 'configure) + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + (define (el-dir store-dir) + (match (find-files store-dir "\\.el$") + ((f1 f2 ...) (dirname f1)) + (_ ""))) + + (let ((sh (search-input-file inputs "/bin/sh"))) + (define emacs-prefix? (cut string-prefix? "emacs-" <>)) + + (setenv "SHELL" "sh") + (setenv "EMACSLOADPATH" + (string-concatenate + (map (match-lambda + (((? emacs-prefix? name) . dir) + (string-append (el-dir dir) ":")) + (_ "")) + inputs))) + (substitute* (find-files "." "\\.el") (("/bin/sh") sh))))) + (add-before 'check 'delete-failing-tests + ;; XXX: these tests require GHC executable, which would be a big + ;; native input. + (lambda _ + (with-directory-excursion "tests" + ;; File `haskell-indent-tests.el' fails with + ;; `haskell-indent-put-region-in-literate-2' + ;; on Emacs 27.1+ + ;; XXX: https://github.com/haskell/haskell-mode/issues/1714 + (for-each delete-file + '("haskell-indent-tests.el" + "haskell-customize-tests.el" + "inferior-haskell-tests.el"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (el-dir (emacs:elpa-directory out)) + (doc (string-append + out "/share/doc/haskell-mode-" #$version)) + (info (string-append out "/share/info"))) + (define (copy-to-dir dir files) + (for-each (lambda (f) + (install-file f dir)) + files)) + + (with-directory-excursion "doc" + (invoke "makeinfo" "haskell-mode.texi") + (install-file "haskell-mode.info" info)) + (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) + (copy-to-dir el-dir (find-files "." "\\.elc?")))))))) + (home-page "https://github.com/haskell/haskell-mode") + (synopsis "Haskell mode for Emacs") + (description + "This is an Emacs mode for editing, debugging and developing Haskell programs.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-dante (let ((commit "38b589417294c7ea44bf65b73b8046d950f9531b") -- 2.36.1