From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVLk3-0002oE-Hz for guix-patches@gnu.org; Mon, 27 May 2019 15:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVLk2-0005ix-6f for guix-patches@gnu.org; Mon, 27 May 2019 15:57:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hVLk1-0005iT-9h for guix-patches@gnu.org; Mon, 27 May 2019 15:57:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hVLk1-00066z-73 for guix-patches@gnu.org; Mon, 27 May 2019 15:57:05 -0400 Subject: [bug#35930] [PATCH 4/4] gnu: haskell: leave Setup.hs generation to build system Resent-Message-ID: From: Robert Vollmert Date: Mon, 27 May 2019 21:56:19 +0200 Message-Id: <20190527195619.59883-4-rob@vllmrt.net> In-Reply-To: <20190527195619.59883-1-rob@vllmrt.net> References: <20190527195619.59883-1-rob@vllmrt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35930@debbugs.gnu.org Cc: Robert Vollmert 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))) -- 2.20.1 (Apple Git-117)