From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 UEZjLjaWhmJCtAAAbAwnHQ (envelope-from ) for ; Thu, 19 May 2022 21:10:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4PlcLTaWhmIW7AAAG6o9tA (envelope-from ) for ; Thu, 19 May 2022 21:10:46 +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 5AE222286A for ; Thu, 19 May 2022 21:10:45 +0200 (CEST) Received: from localhost ([::1]:47554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrlXn-0003pW-OE for larch@yhetil.org; Thu, 19 May 2022 15:10:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrlXM-0003mA-ML for bug-guix@gnu.org; Thu, 19 May 2022 15:10:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrlX8-0005dV-JE for bug-guix@gnu.org; Thu, 19 May 2022 15:10:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrlX8-0002Da-CE for bug-guix@gnu.org; Thu, 19 May 2022 15:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#55495: [PATCH] gnu: emacs-haskell-mode: Fix build. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 19 May 2022 19:10: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: Taiju HIGASHI , 55495@debbugs.gnu.org Received: via spool by 55495-submit@debbugs.gnu.org id=B55495.16529873668477 (code B ref 55495); Thu, 19 May 2022 19:10:02 +0000 Received: (at 55495) by debbugs.gnu.org; 19 May 2022 19:09:26 +0000 Received: from localhost ([127.0.0.1]:36599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrlWX-0002Cf-Q0 for submit@debbugs.gnu.org; Thu, 19 May 2022 15:09:26 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:39644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrlWU-0002CO-O9 for 55495@debbugs.gnu.org; Thu, 19 May 2022 15:09:24 -0400 Received: by mail-ej1-f65.google.com with SMTP id tk15so11713843ejc.6 for <55495@debbugs.gnu.org>; Thu, 19 May 2022 12:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=EVcuGL3mUDhlmttnckwfHiiJnputFAFFvn9AIryyMy4=; b=D6y6VuCpAdUiWxT2M5uTnH5wOXVui5MZ2oBZGlwST5luIfx8HKByT7leAQ569QKY0J IqY3L+E5No/vx3hlBqRbtfVo+hdRFLw9TrV6qGafTm6BCz/D4ztrsBBJhkR68vWJl+/u 5l7rAWbUNJvzuRIDt5OHW9hornBY8GOhJzBnbYkpW5VKexTpcjJC+c3yp39cAtHvSJRk WNaQijHrfArAzrCAZ1bO771pf7mg+75kfKVxooFpZxQUQ+YobTepqCrEUL8TAJx2X3f1 A2icAs6ZCF9GHBq2+KXOsVDO/WLl2ey+Z6eYzNdYQMU/qOc9Rgk9g2xXhnOO1qmEI2Lr gWlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=EVcuGL3mUDhlmttnckwfHiiJnputFAFFvn9AIryyMy4=; b=bb/kFCBVOKyASLFtKS4yBWFMOTOQIkrFdOxohTB4wQSaPgb8CUp3F5US30dmwFGBYS 06YSa3A1NMn6xxlyccqINbXVM+/6o0ay7KviCSDL/WySscpBjtp99qvDbftkqR07CY3G UpMPLR4hleSFLeN7UDhzLnV5hDyYjKtJau9f93OCOukX5sPME9wlGLYimAoXXFdkvBpG onEKaNkPVYG+9n+gE4RwDbhNpiGSJBqI+EKwvbBDcZcfC0I9sL+0ijedsBx1eiwrAY7z bpcpVIYFXbZfxiwGrowsrO/9zqi6QoHqNE9PgEtCcBgwFjbdCFpHooIjdFAMmFHBfCSi +dwQ== X-Gm-Message-State: AOAM531pogZ1NT70xoY/26ey/2hN62u0EgINjkPgnQH6akj2OeuZdgsY WXO3tTQVVGQirmcNYpdElKo= X-Google-Smtp-Source: ABdhPJySX7VjxL4y+gJYDjKhtwCtIx470pe/2L+chZWCvQXtOM5oJmY2aOppHKFgGsOyMFRSMDF6Hw== X-Received: by 2002:a17:906:d54e:b0:6f6:3ea:8e7b with SMTP id cr14-20020a170906d54e00b006f603ea8e7bmr5721261ejc.292.1652987356780; Thu, 19 May 2022 12:09:16 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id og15-20020a1709071dcf00b006f3ef214debsm2368526ejc.81.2022.05.19.12.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 12:09:16 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 19 May 2022 21:09:14 +0200 In-Reply-To: <20220518143129.10357-1-higashi@taiju.info> References: <20220518143129.10357-1-higashi@taiju.info> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.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=1652987445; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=EVcuGL3mUDhlmttnckwfHiiJnputFAFFvn9AIryyMy4=; b=LtcWDTy0iJvkelZDhDuBx0ImcSWmbIyKJnItTfKBwQPU3DIIGmDpfheKYNiFl9wj11FEws 9ONn3oEWXBl91IyvF8owk7hgxHCLxeCHs3iGjToevFi2V2TDTctrQdUcmGpMGFMSc5SFtG VbcSEPFO5hP4BTGzXRLPyADCrGnoDkUPm/InfjAq/3ukyFe7AdXjONSUvOgmCVSebV9gO/ TiRPG4dAYqXeIKoCInsrTdAfiP9bqAPk3iImdR44X9UwjET9tG58RLaoNPhCus8cyoe+2G 8iwQvue92rgcNDAGLAVLW2FrCvnFXjfa4AIvWxejMb/ILhINCJO0ykMuRpIwNw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652987445; a=rsa-sha256; cv=none; b=AWLByQYpt6RdEoPvVzNzb6bjZE+tUgSySGRdueHM7X7NRWDH6HvvT0KhMSNE7gXTbXH0a4 qUrdpGPa998oB7Pfmf85qeo4/8DZoY5mHdqQpmQ4r/XUCz/tqvMiGll4h2BQXgh0mmAbhl Tpg5B9zX4RYvWTj5x7WTEpz8ehRFpqF+V/w96b9qD4vpdvoNb9jx3Too9eRgeXdmrprczv 55TQvk+mM1dM83QQN++3kMQDqvl4mSTHncyj/O1xSAcc5KKA53DZbnIZM4MDxnaqrwXffx YLbmrYooiHj1ivAZpIQMh/bIlV9s9YzKOhuzHDXS3mOT3HQmYDArgef+zXvWwA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=D6y6VuCp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 6.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=D6y6VuCp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 5AE222286A X-Spam-Score: 6.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: zS/L2kE1iQuu Hi, Am Mittwoch, dem 18.05.2022 um 23:31 +0900 schrieb Taiju HIGASHI: > * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Fix build. > --- >  gnu/packages/emacs-xyz.scm                    |   9 +- >  .../emacs-haskell-mode-fix-tests.patch        | 282 > ++++++++++++++++++ >  2 files changed, 289 insertions(+), 2 deletions(-) >  create mode 100644 gnu/packages/patches/emacs-haskell-mode-fix- > tests.patch > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 529e9329d6..9d9669f383 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -1553,11 +1553,16 @@ (define-public emacs-haskell-mode >               (commit version))) >         (file-name (git-file-name name version)) >         (sha256 > -        (base32 > "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")))) > +        (base32 > "0zxbacqzr84krmhqpvzndnvlcjh1gs1x20ys0dykgd7chyhci5j5")) > +        ;; Submitted for inclusion upstream. > +        ;; Not identical patches due to different target versions. > +        ;; (see: https://github.com/haskell/haskell-mode/pull/1780) > +       (patches > +        (search-patches "emacs-haskell-mode-fix-tests.patch")))) >      (propagated-inputs >       (list emacs-dash)) >      (native-inputs > -     (list emacs-minimal emacs-el-search emacs-stream texinfo)) > +     (list emacs-minimal emacs-el-search emacs-stream texinfo git)) There are other ways of suppressing errors caused by git. One of them would be to set vc-handled-backends to nil for the tests. > +-  "Classify the current line into 'section-header 'subsection- > header 'section-data 'comment and 'empty '" > ++  "Classify the current line into 'section-header 'subsection- > header > ++'section-data 'comment and 'empty '" LGTM. > +-  "Enumerate .cabal targets. PROCESS-TYPE determines the format of > the returned target." > ++  "Enumerate .cabal targets. PROCESS-TYPE determines the format of > the > ++returned target." LGTM. > +-Module names in exposed-modules and other-modules are expanded by > replacing each dot (.) in the module name with a forward slash (/) > and appending \".hs\" > ++Module names in exposed-modules and other-modules are expanded by > ++replacing each dot (.) in the module name with a forward slash (/) > and > ++appending \".hs\" LGTM. > +-  "Default build command to use for `haskell-cabal-build' when a > cabal file is detected. > ++  "Default build command to use for `haskell-cabal-build' when a > cabal > ++file is detected. LGTM. > +-  "Alternative build command to use when `haskell-cabal-build' is > called with a negative prefix argument. > ++  "Alternative build command to use when `haskell-cabal-build' is > ++called with a negative prefix argument. LGTM. > +-  "Default build command to use for `haskell-stack-build' when a > stack file is detected. > ++  "Default build command to use for `haskell-stack-build' when a > stack > ++file is detected.x Additional x. > +-  "Alternative build command to use when `haskell-stack-build' is > called with a negative prefix argument. > ++  "Alternative build command to use when `haskell-stack-build' is > ++called with a negative prefix argument. LGTM. > +-  "Default build command to use for `haskell-cabal-build' when no > cabal or stack file is detected. > ++  "Default build command to use for `haskell-cabal-build' when no > ++cabal or stack file is detected. LGTM. > +-  "Controls whether to use cabal, stack, or ghc to compile. > +-   Auto (the default) means infer from the presence of a cabal or > stack spec file, > +-   following same rules as haskell-process-type." > ++  "Controls whether to use cabal, stack, or ghc to compile.  Auto > (the > ++   default) means infer from the presence of a cabal or stack spec > ++   file, following same rules as haskell-process-type." LGTM. > +-  (let (htype dir)                      > ++  (let (htype dir) Indentation change? Suppress those, you want to make the diff as small as possible. > +-  "The way to run cabal comands. It takes two arguments -- the > directory and the command. > ++  "The way to run cabal comands. It takes two arguments -- the > ++directory and the command. LGTM. > +-  "Suggest adding OverloadedStrings pragma to file when getting > type mismatches with [Char]." > ++  "Suggest adding OverloadedStrings pragma to file when getting > type > ++mismatches with [Char]." LGTM. > +-  "Looks for cabal and stack spec files. > +-   When found, returns a pair (TAG . DIR) > +-   where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack; > ++  "Looks for cabal and stack spec files. > ++   When found, returns a pair (TAG . DIR) > ++   where TAG is 'cabal-project, 'cabal-sandbox. 'cabal, or 'stack; LGTM. > +-  "Puts point to the next following symbol, or to end if there are > no more symbols in the sexp." > ++  "Puts point to the next following symbol, or to end if there are > no > ++more symbols in the sexp." LGTM. > +-  "Generate a regex for searching for any occurrence of the prompt\ > ++  "Generate a regex for searching for any occurrence of the prompt LGTM, but you might want to shorten the docstring so that the first line is a synopsis. This would make it easier for upstream to accept. > +-- 'template-haskell-quote: for a string of apostrophes for template > haskell > +-- 'template-haskell-quasi-quote: for a string of apostrophes for > template haskell > ++- 'template-haskell-quote: for a string of apostrophes for template > ++  haskell > ++- 'template-haskell-quasi-quote: for a string of apostrophes for > ++  template haskell LGTM. > +-  "If point is in an SCC annotation, kill the annotation.  > Otherwise, try to insert a new annotation." > ++  "If point is in an SCC annotation, kill the annotation. > ++Otherwise, try to insert a new annotation." LGTM. > +-  "Template string that will be inserted in new haskell buffers via > `haskell-auto-insert-module-template'.") > ++  "Template string that will be inserted in new haskell buffers via > ++`haskell-auto-insert-module-template'.") LGTM. > +-  "Shift the nested off-side-rule block adjacent to point by COLS > columns to the right. > ++  "Shift the nested off-side-rule block adjacent to point by COLS > ++columns to the right. LGTM. > +-  "Try to send a string to the process's process. Ask to restart if > it's not running." > ++  "Try to send a string to the process's process. Ask to restart if > ++it's not running." LGTM. > +-  "Run a loading-ish COMMAND that wants to pick up type errors\ > ++  "Run a loading-ish COMMAND that wants to pick up type errors As above, what is "loading-ish", are "things like that" relevant, etc. > +-  "Regular expression for matching multiline prompt (the one inside > :{ ... :} blocks).") > ++  "Regular expression for matching multiline prompt (the one inside > ++:{ ... :} blocks).") LGTM. > +-    ((haskell-mode . ((haskell-w3m-haddock-dirs . > (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) > ++    ((haskell-mode . > ++      ((haskell-w3m-haddock-dirs . > ++       (\"/home/chris/Projects/foobar/.hsenv/cabal/share/doc\"))))) Who is chris? But fair enough, the indentation should be right. Cheers