From patchwork Mon May 27 19:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14093 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 B8A791701A; Mon, 27 May 2019 20:54:13 +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 4C98D16CC8 for ; Mon, 27 May 2019 20:54:13 +0100 (BST) Received: from localhost ([127.0.0.1]:50025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLhE-00023D-QP for patchwork@mira.cbaines.net; Mon, 27 May 2019 15:54:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLhB-00021q-6w for guix-patches@gnu.org; Mon, 27 May 2019 15:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLhA-0003wr-8N for guix-patches@gnu.org; Mon, 27 May 2019 15:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40624) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLhA-0003wl-6E for guix-patches@gnu.org; Mon, 27 May 2019 15:54:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLhA-00060L-38 for guix-patches@gnu.org; Mon, 27 May 2019 15:54:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35934] [PATCH 1/4] gnu: ghc-easy-plot: remove superfluous Setup.hs rename step Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 May 2019 19:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35934@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155898681422978 (code B ref -1); Mon, 27 May 2019 19:54:07 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2019 19:53:34 +0000 Received: from localhost ([127.0.0.1]:54160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgb-0005yX-QM for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLga-0005y7-WD for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:41405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgV-0003XV-RQ for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLgU-0001zM-N0 for guix-patches@gnu.org; Mon, 27 May 2019 15:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLgT-0003W5-P8 for guix-patches@gnu.org; Mon, 27 May 2019 15:53:26 -0400 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]:12334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgT-0003VS-Jc for guix-patches@gnu.org; Mon, 27 May 2019 15:53:25 -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 mx1.mailbox.org (Postfix) with ESMTPS id C9D865057E; Mon, 27 May 2019 21:53:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id swBvBMPJUrqD; Mon, 27 May 2019 21:53:05 +0200 (CEST) From: Robert Vollmert Date: Mon, 27 May 2019 21:52:48 +0200 Message-Id: <20190527195251.59801-2-rob@vllmrt.net> In-Reply-To: <20190527195251.59801-1-rob@vllmrt.net> References: <20190527195251.59801-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 haskell-build-system already uses whichever of Setup.hs and Setup.lhs exists. * gnu/packages/haskell.scm (ghc-easy-plot): don't rename Setup.lhs to Setup.hs --- gnu/packages/haskell.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 33c9c6484d..44b9e9066a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8063,10 +8063,6 @@ interface for statistics based on hmatrix and GSL.") (base32 "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk")))) (build-system haskell-build-system) (propagated-inputs `(("gnuplot" ,gnuplot))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-setup-suffix - (lambda _ (rename-file "Setup.lhs" "Setup.hs") #t))))) (home-page "https://hub.darcs.net/scravy/easyplot") (synopsis "Haskell plotting library based on gnuplot") (description "This package provides a plotting library for From patchwork Mon May 27 19:52:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14091 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 79ADB1701A; Mon, 27 May 2019 20:54:11 +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 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 28BE216CC8 for ; Mon, 27 May 2019 20:54:11 +0100 (BST) Received: from localhost ([127.0.0.1]:50021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLhC-00021b-PD for patchwork@mira.cbaines.net; Mon, 27 May 2019 15:54:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLh6-000202-8S for guix-patches@gnu.org; Mon, 27 May 2019 15:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLh5-0003t4-Fq for guix-patches@gnu.org; Mon, 27 May 2019 15:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40618) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLh5-0003su-DV for guix-patches@gnu.org; Mon, 27 May 2019 15:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLh5-0005za-AA for guix-patches@gnu.org; Mon, 27 May 2019 15:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35931] [PATCH 2/4] guix: haskell-build-system: correct haddock phase documentation Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 May 2019 19:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35931@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155898680422927 (code B ref -1); Mon, 27 May 2019 19:54:03 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2019 19:53:24 +0000 Received: from localhost ([127.0.0.1]:54149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgR-0005xi-RH for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgQ-0005xM-5M for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:43612) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgI-0003N5-68 for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLgH-0001x5-Aq for guix-patches@gnu.org; Mon, 27 May 2019 15:53:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLgF-0003LH-EY for guix-patches@gnu.org; Mon, 27 May 2019 15:53:13 -0400 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2]:63148 helo=mx2.mailbox.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgD-0003IV-ST for guix-patches@gnu.org; Mon, 27 May 2019 15:53:11 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id B2B39A1086; Mon, 27 May 2019 21:53:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id swaPui8ctvgW; Mon, 27 May 2019 21:53:05 +0200 (CEST) From: Robert Vollmert Date: Mon, 27 May 2019 21:52:49 +0200 Message-Id: <20190527195251.59801-3-rob@vllmrt.net> In-Reply-To: <20190527195251.59801-1-rob@vllmrt.net> References: <20190527195251.59801-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 * guix/build/haskell-build-system.scm (haddock): Correct docstring --- guix/build/haskell-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 23d97e6602..5c5b32322b 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -260,7 +260,7 @@ given Haskell package." #t) (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys) - "Run the test suite of a given Haskell package." + "Generate haddock documentation of a given Haskell package." (when haddock? (run-setuphs "haddock" haddock-flags)) #t) From patchwork Mon May 27 19:52:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14092 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 13B651701A; Mon, 27 May 2019 20:54:13 +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 A1FB616CC8 for ; Mon, 27 May 2019 20:54:12 +0100 (BST) Received: from localhost ([127.0.0.1]:50023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLhE-00022Z-4w for patchwork@mira.cbaines.net; Mon, 27 May 2019 15:54:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLh7-00020M-De for guix-patches@gnu.org; Mon, 27 May 2019 15:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLh6-0003tq-AT for guix-patches@gnu.org; Mon, 27 May 2019 15:54:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLh6-0003td-7j for guix-patches@gnu.org; Mon, 27 May 2019 15:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLh6-0005zp-61 for guix-patches@gnu.org; Mon, 27 May 2019 15:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35932] [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:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35932 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35932@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155898680822955 (code B ref -1); Mon, 27 May 2019 19:54:03 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2019 19:53:28 +0000 Received: from localhost ([127.0.0.1]:54155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgW-0005y8-40 for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgS-0005xT-3C for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:36183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgM-0003PN-5Y for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLgL-0001x9-29 for guix-patches@gnu.org; Mon, 27 May 2019 15:53:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLgH-0003MJ-AZ for guix-patches@gnu.org; Mon, 27 May 2019 15:53:15 -0400 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]:11180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgF-0003Iy-EK for guix-patches@gnu.org; Mon, 27 May 2019 15:53:13 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 3D8884FBC4; Mon, 27 May 2019 21:53:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id UWPPlkQqEckD; Mon, 27 May 2019 21:53:05 +0200 (CEST) From: Robert Vollmert Date: Mon, 27 May 2019 21:52:50 +0200 Message-Id: <20190527195251.59801-4-rob@vllmrt.net> In-Reply-To: <20190527195251.59801-1-rob@vllmrt.net> References: <20190527195251.59801-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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) From patchwork Mon May 27 19:52:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14094 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 6C3041701A; Mon, 27 May 2019 20:54:22 +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 ECE9A16CC8 for ; Mon, 27 May 2019 20:54:21 +0100 (BST) Received: from localhost ([127.0.0.1]:50027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLhN-0002DY-Ju for patchwork@mira.cbaines.net; Mon, 27 May 2019 15:54:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLh8-00021B-ES for guix-patches@gnu.org; Mon, 27 May 2019 15:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLh7-0003uP-7B for guix-patches@gnu.org; Mon, 27 May 2019 15:54:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLh7-0003uL-52 for guix-patches@gnu.org; Mon, 27 May 2019 15:54:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLh7-000604-2z for guix-patches@gnu.org; Mon, 27 May 2019 15:54:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35933] [PATCH 4/4] gnu: haskell: leave Setup.hs generation to build system Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 May 2019 19:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35933@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155898680822961 (code B ref -1); Mon, 27 May 2019 19:54:04 +0000 Received: (at submit) by debbugs.gnu.org; 27 May 2019 19:53:28 +0000 Received: from localhost ([127.0.0.1]:54157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgW-0005yC-EO for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hVLgS-0005xS-2Q for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:32930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgM-0003PP-6n for submit@debbugs.gnu.org; Mon, 27 May 2019 15:53:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLgL-0001xA-2Q for guix-patches@gnu.org; Mon, 27 May 2019 15:53:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLgH-0003MO-At for guix-patches@gnu.org; Mon, 27 May 2019 15:53:15 -0400 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2]:63186 helo=mx2.mailbox.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVLgF-0003J7-Dh for guix-patches@gnu.org; Mon, 27 May 2019 15:53:13 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 84BD4A1087; Mon, 27 May 2019 21:53:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id DfH58tvzvNF2; Mon, 27 May 2019 21:53:06 +0200 (CEST) From: Robert Vollmert Date: Mon, 27 May 2019 21:52:51 +0200 Message-Id: <20190527195251.59801-5-rob@vllmrt.net> In-Reply-To: <20190527195251.59801-1-rob@vllmrt.net> References: <20190527195251.59801-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 Remove explicit Setup.hs generation from the configure step now that haskell-build-system does it. * gnu/packages/haskell.scm (ghc-foundation, ghc-inline-c, ghc-inline-c-cpp, ghc-rio): Don't generate Setup.hs --- gnu/packages/haskell.scm | 42 ---------------------------------------- 1 file changed, 42 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 44b9e9066a..160b0a1fca 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9688,16 +9688,6 @@ packages.") (base32 "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'add-setup-script - (lambda _ - ;; The usual "Setup.hs" script is missing from the source. - (with-output-to-file "Setup.hs" - (lambda () - (format #t "import Distribution.Simple~%") - (format #t "main = defaultMain~%")))))))) (inputs `(("ghc-basement" ,ghc-basement))) (home-page "https://github.com/haskell-foundation/foundation") (synopsis "Alternative prelude with batteries and no dependencies") @@ -10575,16 +10565,6 @@ widths to the Char type.") (base32 "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'add-setup-script - (lambda _ - ;; The usual "Setup.hs" script is missing from the source. - (with-output-to-file "Setup.hs" - (lambda () - (format #t "import Distribution.Simple~%") - (format #t "main = defaultMain~%")))))))) (inputs `(("ghc-exceptions" ,ghc-exceptions) ("ghc-hashable" ,ghc-hashable) @@ -11107,17 +11087,6 @@ DOS/Windows paths and markup languages (such as XML).") (base32 "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'create-Setup.hs - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display "\ -import Distribution.Simple -main = defaultMain"))) - #t))))) (inputs `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) ("ghc-cryptohash" ,ghc-cryptohash) @@ -11251,17 +11220,6 @@ handling wrong.") (base32 "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'create-Setup.hs - (lambda _ - (with-output-to-file "Setup.hs" - (lambda _ - (display "\ -import Distribution.Simple -main = defaultMain"))) - #t))))) (inputs `(("ghc-inline-c" ,ghc-inline-c) ("ghc-safe-exceptions" ,ghc-safe-exceptions)))