From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp10.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id 8AutAejnTWJ1jgAAgWs5BA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Wed, 06 Apr 2022 21:20:08 +0200
Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp10.migadu.com with LMTPS
	id OInqNefnTWLEtgAAG6o9tA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Wed, 06 Apr 2022 21:20:07 +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 6A5A239F6B
	for <larch@yhetil.org>; Wed,  6 Apr 2022 21:20:07 +0200 (CEST)
Received: from localhost ([::1]:42276 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1ncBCI-0003Vx-L8
	for larch@yhetil.org; Wed, 06 Apr 2022 15:20:06 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:55114)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ncBCE-0003Vh-87
 for guix-patches@gnu.org; Wed, 06 Apr 2022 15:20:02 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:37037)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ncBCD-00040I-VN
 for guix-patches@gnu.org; Wed, 06 Apr 2022 15:20:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ncBCD-0002uP-QO
 for guix-patches@gnu.org; Wed, 06 Apr 2022 15:20:01 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#54729] [PATCH core-updates v2 1/2] build: haskell-build-system:
 Remove trailing #t.
References: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@munksgaard.me>
In-Reply-To: <8a396a9803fc35ee63f01e608f87ffb16863bc6d.1649171729.git.philip@munksgaard.me>
Resent-From: zimoun <zimon.toutoune@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Wed, 06 Apr 2022 19:20:01 +0000
Resent-Message-ID: <handler.54729.B54729.164927276811117@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 54729
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 54729@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Received: via spool by 54729-submit@debbugs.gnu.org id=B54729.164927276811117
 (code B ref 54729); Wed, 06 Apr 2022 19:20:01 +0000
Received: (at 54729) by debbugs.gnu.org; 6 Apr 2022 19:19:28 +0000
Received: from localhost ([127.0.0.1]:59165 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1ncBBg-0002tE-Dd
 for submit@debbugs.gnu.org; Wed, 06 Apr 2022 15:19:28 -0400
Received: from mail-wr1-f49.google.com ([209.85.221.49]:38533)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zimon.toutoune@gmail.com>) id 1ncBBe-0002sq-Nv
 for 54729@debbugs.gnu.org; Wed, 06 Apr 2022 15:19:27 -0400
Received: by mail-wr1-f49.google.com with SMTP id j12so4676838wrb.5
 for <54729@debbugs.gnu.org>; Wed, 06 Apr 2022 12:19:26 -0700 (PDT)
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=xZXE2N5vOvHKN5yXm5bcWpyYr4ZkLhwYjOSD6Z21NtM=;
 b=Xuqj73HGn5i8z8e0IpqxrbHXvdPrZR5575gkbixzw+yvZyZR0nY7MeLdBlkv7Xlv0m
 INa85OATR2fBRG5s1r/Zii8dumqZ7iUsxc7KPctxP9mID7VwtQqsxkG9bc9rJZc0zjpA
 hbb/oeDoR95sBqYOkVLYGpaWZ0htZYH6wyPI5bwnRo01YSUVXiT96/3J6Yap53/NmhK0
 8e3dfBnPNjRu6Wk9oT5OcDOrjQLZAjiaQctQuWlsfxEfFWuXS6gHnxCNoh9+OlRVTDbT
 Z+2qYNYjy5iaXsYlU1/DNZ5Mvqk1wK4FTjUihanUZV/jr5R6qlDZHIc+iYO/N0YSxHv8
 AMCw==
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=xZXE2N5vOvHKN5yXm5bcWpyYr4ZkLhwYjOSD6Z21NtM=;
 b=BFL+m11HGUh/sMRTp7GdnvybnTI59jdvwDr+OPU+F92UxxRzSupxfA/XHuC1HMw1XP
 gM4lBga8SSsoSjUptH+wOAEQGBHK33lXL2jM8uJKgDbJNHcQ2nEUEMZSPnp4hoXWA8i0
 mNcZK4zBa/QkFILHo/oLI2iBcqDnfpn7yU7C4LKMVEW2Sir+YwgLnzQ9SyFZ6cY+G/vU
 khRbxGo/QCbgT9pxqj+f2ztbaxgpaFWlnIgK8nbEwxg0g5flQJzQwW8iAI8XdTg6IUbt
 /cI05815byTJ2O28TYOrTFdX4La2tc3lRz06p9WU8HDelg9E0pllB1DFGnMqU+09wNA3
 pzTw==
X-Gm-Message-State: AOAM5313MmiTxbNMK5A71MRozIrWhA/UeHHoNiu9A+DPAhhYUyjJeWv2
 +LyT4osPuUipAtkK2ToMjTYHN7vvFyE=
X-Google-Smtp-Source: ABdhPJy+dnNm4cRRlxfNUJOoIanymasw8sJRsnAwcBnJCj+qrb8CBBkH3lrlEXy7HEpdDa9jATb+Cw==
X-Received: by 2002:a05:6000:2a8:b0:205:8817:8296 with SMTP id
 l8-20020a05600002a800b0020588178296mr7852023wry.309.1649272760755; 
 Wed, 06 Apr 2022 12:19:20 -0700 (PDT)
Received: from localhost.localdomain ([193.48.40.241])
 by smtp.gmail.com with ESMTPSA id
 u12-20020a5d6dac000000b00204119d37d0sm15230647wrs.26.2022.04.06.12.19.20
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 06 Apr 2022 12:19:20 -0700 (PDT)
From: zimoun <zimon.toutoune@gmail.com>
Date: Wed,  6 Apr 2022 21:19:07 +0200
Message-Id: <20220406191908.2393054-1-zimon.toutoune@gmail.com>
X-Mailer: git-send-email 2.34.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
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=1649272807;
	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:
	 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=xZXE2N5vOvHKN5yXm5bcWpyYr4ZkLhwYjOSD6Z21NtM=;
	b=YAOOvZF7RBIn5tAxdAv8NgRGvmU65x4wZ0G197xCpSIvFwoNRKQEjUm/KX3+nPZjKVdPxj
	+N83SUNow98x1bYagWDwc1ulJ/68GVBuRkBOjSIMRyoPVOugKNPxkOaxTA1QHrDaVRCVyS
	0FiX8wnKAlHz216AwrbixH0OIRQUHlhMHNbh2enjNYiV1qBdN2/k82IjhIoVF5XBuwMj0y
	InwVwrmrNwXkBzI7Jf1ewUZ7fYY1lCKIeJU0qdQ8Fi1aporoSBBJLgxDLllohl/UimBbgA
	9c66b0XtW5N3pRSl9m1Mg99zOQAkFud6kfnWrAhtwq/r/HAibiom57zmPMj28A==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649272807; a=rsa-sha256; cv=none;
	b=OCtyvnHSYhTjuYp1LjH77mFYKD5GcIH2GKj/0YTuZuFWus8Kitwe0TTV850eKl+2+l0rWG
	xtMUh6WLyvU7Mei6xteoBxhyN5OMgFYd5vfDVo/AIzY96+WbFBD/Eo22qsr1zyegdqitkz
	4zaCAWCyA70pt8iCPhzu4k//FBrPG6/7N3Zzd9kxkGtBGiQBUp0Pz+vmHhskaYmwCTUTYA
	U61OdLhY2nyP1xh1n4kOTMm3ugibGRArgwhoLOOuIAdtiXPzhjEfznMCf5C7O2KjCw+P03
	XFx/GZBfjBh8m5fiBDCT6apIjzxcwOQaW++azPbadMm5q3thGhzT6IqQ5sKFCg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Xuqj73HG;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 5.93
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Xuqj73HG;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 6A5A239F6B
X-Spam-Score: 5.93
X-Migadu-Scanner: scn1.migadu.com
X-TUID: 2y70snqhH+rG

* guix/build/haskell-build-system.scm (configure, install, setup-compiler,
make-ghc-package-database, install-transitive-deps, check, haddock,
patch-cabal-file, generate-setuphs): Delete trailing #t.
---
 guix/build/haskell-build-system.scm | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm
index ef6cb316ee..e2e5904dce 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -118,8 +119,7 @@ (define* (configure #:key outputs inputs tests? (configure-flags '())
       (setenv "CONFIG_SHELL" "sh"))
     (run-setuphs "configure" params)
 
-    (setenv "GHC_PACKAGE_PATH" ghc-path)
-    #t))
+    (setenv "GHC_PACKAGE_PATH" ghc-path)))
 
 (define* (build #:key parallel-build? #:allow-other-keys)
   "Build a given Haskell package."
@@ -140,8 +140,7 @@ (define* (install #:key outputs #:allow-other-keys)
                          (new    (string-append static subdir)))
                     (mkdir-p (dirname new))
                     (rename-file static-lib new)))
-                (find-files lib "\\.a$"))))
-  #t)
+                (find-files lib "\\.a$")))))
 
 (define* (setup-compiler #:key system inputs outputs #:allow-other-keys)
   "Setup the compiler environment."
@@ -175,8 +174,7 @@ (define (make-ghc-package-database system inputs outputs)
               conf-files)
     (invoke "ghc-pkg"
             (string-append "--package-db=" %tmp-db-dir)
-            "recache")
-    #t))
+            "recache")))
 
 (define* (register #:key name system inputs outputs #:allow-other-keys)
   "Generate the compiler registration and binary package database files for a
@@ -273,21 +271,18 @@ (define (install-transitive-deps conf-file src dest)
                                     config-file-name+id ".conf"))
         (invoke "ghc-pkg"
                 (string-append "--package-db=" config-dir)
-                "recache")))
-    #t))
+                "recache")))))
 
 (define* (check #:key tests? test-target #:allow-other-keys)
   "Run the test suite of a given Haskell package."
   (if tests?
       (run-setuphs test-target '())
-      (format #t "test suite not run~%"))
-  #t)
+      (format #t "test suite not run~%")))
 
 (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys)
   "Generate the Haddock documentation of a given Haskell package."
   (when haddock?
-    (run-setuphs "haddock" haddock-flags))
-  #t)
+    (run-setuphs "haddock" haddock-flags)))
 
 (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys)
   (when cabal-revision
@@ -296,8 +291,7 @@ (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys)
       ((original)
        (format #t "replacing ~s with ~s~%" original cabal-revision)
        (copy-file cabal-revision original))
-      (_ (error "Could not find a Cabal file to patch."))))
-  #t)
+      (_ (error "Could not find a Cabal file to patch.")))))
 
 (define* (generate-setuphs #:rest empty)
   "Generate a default Setup.hs if needed."
@@ -307,8 +301,7 @@ (define* (generate-setuphs #:rest empty)
     (with-output-to-file "Setup.hs"
       (lambda ()
         (format #t "import Distribution.Simple~%")
-        (format #t "main = defaultMain~%"))))
-  #t)
+        (format #t "main = defaultMain~%")))))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases

base-commit: e3e3381fdbc56f351063d9b4a49e99645b20d7d3
-- 
2.34.0