From patchwork Wed Apr 8 10:21:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 21163 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 678B227BBE4; Wed, 8 Apr 2020 11:23:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F073527BBE1 for ; Wed, 8 Apr 2020 11:23:09 +0100 (BST) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7rR-0005YV-EL for patchwork@mira.cbaines.net; Wed, 08 Apr 2020 06:23:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48963) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jM7rL-0005WM-12 for guix-patches@gnu.org; Wed, 08 Apr 2020 06:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jM7rJ-0002Aa-Ur for guix-patches@gnu.org; Wed, 08 Apr 2020 06:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jM7rJ-0002AS-S7 for guix-patches@gnu.org; Wed, 08 Apr 2020 06:23:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jM7rJ-0003Yp-NR for guix-patches@gnu.org; Wed, 08 Apr 2020 06:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package definition. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= 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 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?b?S8SFZHppb8WCa2E=?= 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 X-Qmailux-2.08st: added fake Content-Type header X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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")