From patchwork Mon May 27 19:56:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14098 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D9C21701A; Mon, 27 May 2019 20:57:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C831316CC8 for ; Mon, 27 May 2019 20:57:13 +0100 (BST) Received: from localhost ([127.0.0.1]:50075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLk9-0002sE-B2 for patchwork@mira.cbaines.net; Mon, 27 May 2019 15:57:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLk2-0002o6-6r for guix-patches@gnu.org; Mon, 27 May 2019 15:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLk0-0005iK-TE for guix-patches@gnu.org; Mon, 27 May 2019 15:57:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40649) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLk0-0005iD-R7 for guix-patches@gnu.org; Mon, 27 May 2019 15:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLk0-00066s-P5 for guix-patches@gnu.org; Mon, 27 May 2019 15:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35930] [PATCH 3/4] guix: haskell-build-system: generate Setup.hs if not exists Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 May 2019 19:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35930 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35930@debbugs.gnu.org Received: via spool by 35930-submit@debbugs.gnu.org id=B35930.155898699023412 (code B ref 35930); Mon, 27 May 2019 19:57:04 +0000 Received: (at 35930) by debbugs.gnu.org; 27 May 2019 19:56:30 +0000 Received: from localhost ([127.0.0.1]:54187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLjR-00065T-Uu for submit@debbugs.gnu.org; Mon, 27 May 2019 15:56:30 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:53228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLjP-000652-U6 for 35930@debbugs.gnu.org; Mon, 27 May 2019 15:56:28 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 713F1A1038; Mon, 27 May 2019 21:56:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id A3i7yAb_9QIT; Mon, 27 May 2019 21:56:21 +0200 (CEST) From: Robert Vollmert Date: Mon, 27 May 2019 21:56:18 +0200 Message-Id: <20190527195619.59883-3-rob@vllmrt.net> In-Reply-To: <20190527195619.59883-1-rob@vllmrt.net> References: <20190527195619.59883-1-rob@vllmrt.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The default Setup.hs is boilerplate that is frequently left out of source packages, causing build failure for package definitions as generated by `guix import hackage`. Compare * guix/build/haskell-build-system.scm: Generate Setup.hs if missing, after unpack phase. --- guix/build/haskell-build-system.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 5c5b32322b..0c648e510f 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -275,9 +275,21 @@ given Haskell package." (_ (error "Could not find a Cabal file to patch.")))) #t) +(define* (generate-setup #:rest empty) + "Generate boilerplate Setup.hs if missing." + (when (not (or (file-exists? "Setup.hs") + (file-exists? "Setup.lhs"))) + (format #t "generating missing Setup.hs~%") + (with-output-to-file "Setup.hs" + (lambda () + (format #t "import Distribution.Simple~%") + (format #t "main = defaultMain~%")))) + #t) + (define %standard-phases (modify-phases gnu:%standard-phases (add-after 'unpack 'patch-cabal-file patch-cabal-file) + (add-after 'unpack 'generate-setup generate-setup) (delete 'bootstrap) (add-before 'configure 'setup-compiler setup-compiler) (add-before 'install 'haddock haddock)