From unknown Sat Jun 21 03:31:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package definition. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Apr 2020 10:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40503@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158634132213591 (code B ref -1); Wed, 08 Apr 2020 10:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2020 10:22:02 +0000 Received: from localhost ([127.0.0.1]:51423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM7qM-0003X9-1Q for submit@debbugs.gnu.org; Wed, 08 Apr 2020 06:22:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:43385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM7qJ-0003Wi-SO for submit@debbugs.gnu.org; Wed, 08 Apr 2020 06:22:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48920) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7qI-0005SB-PM for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:59 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jM7qH-0001mh-Lc for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:58 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:55004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jM7qH-0001hD-CD for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:57 -0400 Received: (qmail 24482 invoked by uid 1009); 8 Apr 2020 12:21:48 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25775. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.010274 secs); 08 Apr 2020 10:21:48 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 8 Apr 2020 12:21:48 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Wed, 8 Apr 2020 12:21:42 +0200 Message-Id: <20200408102142.3011-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 37.59.186.212 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove the unused rpath module. [phases]: Use invoke instead of system*. --- gnu/packages/haskell.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8db650e6ae..40490cbbb6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -183,11 +183,8 @@ top of CLISP.") #:modules ((guix build gnu-build-system) (guix build utils) - (guix build rpath) (srfi srfi-26) (srfi srfi-1)) - #:imported-modules (,@%gnu-build-system-modules - (guix build rpath)) #:configure-flags (list (string-append "--with-gmp-libraries=" @@ -214,7 +211,7 @@ top of CLISP.") (with-directory-excursion ".." (copy-file (assoc-ref inputs "ghc-testsuite") "ghc-testsuite.tar.xz") - (system* "tar" "xvf" "ghc-testsuite.tar.xz")) + (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) (substitute* (list "testsuite/timeout/Makefile" "testsuite/timeout/timeout.py" @@ -233,7 +230,7 @@ top of CLISP.") (with-directory-excursion ghc-bootstrap-path (copy-file (assoc-ref inputs "ghc-binary") "ghc-bin.tar.xz") - (zero? (system* "tar" "xvf" "ghc-bin.tar.xz")))) + (invoke "tar" "xvf" "ghc-bin.tar.xz"))) (alist-cons-before 'install-bin 'configure-bin (lambda* (#:key inputs outputs #:allow-other-keys) @@ -265,7 +262,7 @@ top of CLISP.") (setenv "LD_LIBRARY_PATH" gmp-lib) ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. (for-each - (cut system* "patchelf" "--set-interpreter" ld-so <>) + (cut invoke "patchelf" "--set-interpreter" ld-so <>) binaries) ;; The binaries include a reference to libtinfo.so.5 which ;; is a subset of libncurses.so.5. We create a symlink in a @@ -284,7 +281,7 @@ top of CLISP.") (setenv "PATH" (string-append (getenv "PATH") ":" ghc-bootstrap-prefix "/bin")) - (system* + (invoke (string-append (getcwd) "/configure") (string-append "--prefix=" ghc-bootstrap-prefix) (string-append "--with-gmp-libraries=" gmp-lib) @@ -294,7 +291,7 @@ top of CLISP.") (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion (string-append ghc-bootstrap-path "/ghc-7.8.4") - (zero? (system* "make" "install")))) + (invoke "make" "install"))) %standard-phases))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") -- 2.26.0 From unknown Sat Jun 21 03:31:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package definition. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Apr 2020 10:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , 40503@debbugs.gnu.org Received: via spool by 40503-submit@debbugs.gnu.org id=B40503.158634232515571 (code B ref 40503); Wed, 08 Apr 2020 10:39:02 +0000 Received: (at 40503) by debbugs.gnu.org; 8 Apr 2020 10:38:45 +0000 Received: from localhost ([127.0.0.1]:51431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM86W-000434-Ti for submit@debbugs.gnu.org; Wed, 08 Apr 2020 06:38:45 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:35959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM86T-00042q-Pg for 40503@debbugs.gnu.org; Wed, 08 Apr 2020 06:38:43 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id C18A1907; Wed, 8 Apr 2020 06:38:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 08 Apr 2020 06:38:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=J1oWAjwTa2xjnjgbjUXUrm8s7S jooTTKGE+ZN6ZVcZE=; b=xD92s5mVTxam3X9tA9gCQ2HT/STMecc1at0lONdtVo wBYLmcqhffgTPAO1xZAStkh8fA9wKCuxHjXI7uSTDapwuwXn5ZXn0JxhbomWeSgH rWv1HlIQzUCMPUgrhWOORrO0W69HEvC7RhL4YVcXn36oc+A+NFn11O76w6RK2T8f COucmzrtzixjFAVHoRtO8qLzI4DYNQMpRffjT55vp4F7aw1Ryg7fwSyHQuQ+Lndm QuXMRX2YPdVBQtMWfmqBBAdAOcnEMckA5scYuIf9devMGifkiGwnG/Xq0+mL7ERK VUnbKqzawiVEkCxlcodmPL5ryj3rZ/Je5EWSZvaxJkjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=J1oWAj wTa2xjnjgbjUXUrm8s7SjooTTKGE+ZN6ZVcZE=; b=JuAuaJ2gR2/6bTxqeR5uHX y894lkSpm4wMODCHUojL4dfSmzOl2wv4bP6sc8da1Ra5K9nY5jgmYPtSCBZHCEXv bQk2kmxNdbonfuYDUhHi0Rdb/n5R8HPw5a5DOkkHicbffaBpktcvBfCcILAkw6cU rcuYFk72wMppZBDwUOA2BjeLGdHsWVf0TscvgsofaVa7XBZwFvu8fXgo2YOdtitG GYuIzSLEVfnj3mc0ak0EHqRdvC9fKSJmJwlSL1XZjFyhhTntF4S2/6RB2hEPCEog 9jkPWIBm/d3bNV1JeW3XVtYGRT8k0gdD2ibGdXyWgR8X+n7JOYMO7Y3wmuZgmCVA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudejgdeftdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufgjfhgffffkgggtsehgtderre dtreejnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhm rghilhdrtghomh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id DE34C3280074; Wed, 8 Apr 2020 06:38:34 -0400 (EDT) From: Marius Bakke In-Reply-To: <20200408102142.3011-1-kuba@kadziolka.net> References: <20200408102142.3011-1-kuba@kadziolka.net> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 08 Apr 2020 12:38:32 +0200 Message-ID: <87v9majm8n.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jakub K=C4=85dzio=C5=82ka writes: > * gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove > the unused rpath module. > [phases]: Use invoke instead of system*. This LGTM, but there have been a few changes to GHC on 'core-updates' so I'd prefer to hold this patch until core-updates is merged to avoid needless conflicts. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6NqagACgkQoqBt8qM6 VPrsaQgAqwjom/9ZwWBB24g2D8jiIxh4T99OmT9xVpaOCqaec3xks2L/jiehVafP 7Qg7Lb8kJWSDEiEEW2kI8PAnu29BBX7/XaNRiS7UMwewf2KJhHPTrzbcEVqQhvAE 2mNEF7T2lFJBS+qn42na8akWNHl4f8GCtVTSSr091U6YscWcBiWt4D6y9FkKIRPR o7a4fvq8WvuMYxHtOmVEKnPnqBhUkdiU7EM28gEZD2WWuR7qN3ujra5DRz9ab7/J d+LxvYxzSil9YmhX2VgF0VBNS7BnKwMdbaBFZi7/FrFg34QZkxW0K45tCaRMtVLJ 8qiSQewS6WDonUIBMYxlJvUunola0g== =bpUt -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 21 03:31:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Subject: bug#40503: closed (Re: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package definition.) Message-ID: References: <20200601154520.3tnnq5lbzjfxayux@gravity> <20200408102142.3011-1-kuba@kadziolka.net> X-Gnu-PR-Message: they-closed 40503 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40503@debbugs.gnu.org Date: Mon, 01 Jun 2020 15:46:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1591026362-32170-1" This is a multi-part message in MIME format... ------------=_1591026362-32170-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40503: [PATCH staging] gnu: ghc-7: Clean up package definition. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40503@debbugs.gnu.org. --=20 40503: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40503 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1591026362-32170-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40503-done) by debbugs.gnu.org; 1 Jun 2020 15:45:25 +0000 Received: from localhost ([127.0.0.1]:36762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfmcv-0008M3-L4 for submit@debbugs.gnu.org; Mon, 01 Jun 2020 11:45:25 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:46560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfmcu-0008Lt-AM for 40503-done@debbugs.gnu.org; Mon, 01 Jun 2020 11:45:24 -0400 Received: (qmail 28770 invoked by uid 1009); 1 Jun 2020 17:45:21 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25829. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.047788 secs); 01 Jun 2020 15:45:21 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 1 Jun 2020 17:45:21 +0200 Date: Mon, 1 Jun 2020 17:45:20 +0200 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: Marius Bakke Subject: Re: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package definition. Message-ID: <20200601154520.3tnnq5lbzjfxayux@gravity> References: <20200408102142.3011-1-kuba@kadziolka.net> <87v9majm8n.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="itmiu54suyg6zqzj" Content-Disposition: inline In-Reply-To: <87v9majm8n.fsf@devup.no> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40503-done Cc: 40503-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --itmiu54suyg6zqzj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 08, 2020 at 12:38:32PM +0200, Marius Bakke wrote: > Jakub K=C4=85dzio=C5=82ka writes: >=20 > > * gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove > > the unused rpath module. > > [phases]: Use invoke instead of system*. >=20 > This LGTM, but there have been a few changes to GHC on 'core-updates' so > I'd prefer to hold this patch until core-updates is merged to avoid > needless conflicts. Following the core-updates merge, I have committed the change to staging as commit f20d1cfb51ed14f325da000406807076323f70bc. Regards, Jakub K=C4=85dzio=C5=82ka --itmiu54suyg6zqzj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl7VIo8ACgkQ4xWnWEYT FWR9/A//WHV3jCFfpE52m2iL+JYqg532V/uWcx/FWDmlnyJ1umCsTthjbCdA8bQk 74KwDZNuE3Y1Z8Kg6AHHXVO6V7VyehVFwAHqSkc19j0qENDqcfGZsbThSwA0CutG DtCIjWv9ZJJpre2DOHdhSm9nv1HQzqxk3tGImlSv54DX5zDjaGgkC51q5zHXaQhK RQVqHBOvSrw3BBE16z9xWJti8Ze7EskkN9xhhKiDZThPfkGYJo3LYoixqNlbsoAC Xlku3iLMKwH2DummmaOMztdbj750ty0q8AEJ8QQQenS7bR2GBgI8ao3kBwvLIREb tGrlSw6GhTuh5lmr64WdZjvnQ4hBvCHX6/ZI6cIRANyzubBw46TmTismJEx739SV a8Z5ehAIUS+9vB1ckMU08coPS+P6RsVJzU5Vz3/0et7D+GcfiOF7ppKOAHriGLuG sC8N/ZaCC3k+Rk4CNnRMaZkBMJcSF6to/yI7+d45VPmN8PZrwaGc83NWyEejF1oj Pf0f3LoGdYibgfNzrQV0izeCWfSH1rKol40vKU15KiVNDvHsYRugJoPc3mKHd+8/ 4xiqhjxTKYary/CFUEKoX1EfN9kicOo6LJoXKCp2rP9qIVEisZoA64jnui999hjs 9KJ+fzs3JQCYpDw33OO9FJ/a8A/rHVoIds8XfUvCUqzDvd7Msp8= =bIg0 -----END PGP SIGNATURE----- --itmiu54suyg6zqzj-- ------------=_1591026362-32170-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Apr 2020 10:22:02 +0000 Received: from localhost ([127.0.0.1]:51423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM7qM-0003X9-1Q for submit@debbugs.gnu.org; Wed, 08 Apr 2020 06:22:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:43385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jM7qJ-0003Wi-SO for submit@debbugs.gnu.org; Wed, 08 Apr 2020 06:22:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48920) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7qI-0005SB-PM for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:59 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jM7qH-0001mh-Lc for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:58 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:55004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jM7qH-0001hD-CD for guix-patches@gnu.org; Wed, 08 Apr 2020 06:21:57 -0400 Received: (qmail 24482 invoked by uid 1009); 8 Apr 2020 12:21:48 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25775. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.010274 secs); 08 Apr 2020 10:21:48 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 8 Apr 2020 12:21:48 +0200 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= To: guix-patches@gnu.org Subject: [PATCH staging] gnu: ghc-7: Clean up package definition. Date: Wed, 8 Apr 2020 12:21:42 +0200 Message-Id: <20200408102142.3011-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 37.59.186.212 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove the unused rpath module. [phases]: Use invoke instead of system*. --- gnu/packages/haskell.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8db650e6ae..40490cbbb6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -183,11 +183,8 @@ top of CLISP.") #:modules ((guix build gnu-build-system) (guix build utils) - (guix build rpath) (srfi srfi-26) (srfi srfi-1)) - #:imported-modules (,@%gnu-build-system-modules - (guix build rpath)) #:configure-flags (list (string-append "--with-gmp-libraries=" @@ -214,7 +211,7 @@ top of CLISP.") (with-directory-excursion ".." (copy-file (assoc-ref inputs "ghc-testsuite") "ghc-testsuite.tar.xz") - (system* "tar" "xvf" "ghc-testsuite.tar.xz")) + (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) (substitute* (list "testsuite/timeout/Makefile" "testsuite/timeout/timeout.py" @@ -233,7 +230,7 @@ top of CLISP.") (with-directory-excursion ghc-bootstrap-path (copy-file (assoc-ref inputs "ghc-binary") "ghc-bin.tar.xz") - (zero? (system* "tar" "xvf" "ghc-bin.tar.xz")))) + (invoke "tar" "xvf" "ghc-bin.tar.xz"))) (alist-cons-before 'install-bin 'configure-bin (lambda* (#:key inputs outputs #:allow-other-keys) @@ -265,7 +262,7 @@ top of CLISP.") (setenv "LD_LIBRARY_PATH" gmp-lib) ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. (for-each - (cut system* "patchelf" "--set-interpreter" ld-so <>) + (cut invoke "patchelf" "--set-interpreter" ld-so <>) binaries) ;; The binaries include a reference to libtinfo.so.5 which ;; is a subset of libncurses.so.5. We create a symlink in a @@ -284,7 +281,7 @@ top of CLISP.") (setenv "PATH" (string-append (getenv "PATH") ":" ghc-bootstrap-prefix "/bin")) - (system* + (invoke (string-append (getcwd) "/configure") (string-append "--prefix=" ghc-bootstrap-prefix) (string-append "--with-gmp-libraries=" gmp-lib) @@ -294,7 +291,7 @@ top of CLISP.") (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion (string-append ghc-bootstrap-path "/ghc-7.8.4") - (zero? (system* "make" "install")))) + (invoke "make" "install"))) %standard-phases))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") -- 2.26.0 ------------=_1591026362-32170-1--