GNU bug report logs - #40503
[PATCH staging] gnu: ghc-7: Clean up package definition.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40503 in the body.
You can then email your comments to 40503 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: guix-patches <at> gnu.org
Subject: [PATCH staging] gnu: ghc-7: Clean up package definition.
Date: Wed,  8 Apr 2020 12:21:42 +0200

* 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

Message #8 received at 40503 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Jakub Kądziołka <kuba <at> kadziolka.net>,
 40503 <at> debbugs.gnu.org
Subject: Re: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package
 definition.
Date: Wed, 08 Apr 2020 12:38:32 +0200

[Message part 1 (text/plain, inline)]

Jakub Kądziołka <kuba <at> kadziolka.net> 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.

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 40503-done <at> debbugs.gnu.org (full text, mbox):

From: Jakub Kądziołka <kuba <at> kadziolka.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 40503-done <at> debbugs.gnu.org
Subject: Re: [bug#40503] [PATCH staging] gnu: ghc-7: Clean up package
 definition.
Date: Mon, 1 Jun 2020 17:45:20 +0200

[Message part 1 (text/plain, inline)]

On Wed, Apr 08, 2020 at 12:38:32PM +0200, Marius Bakke wrote:
> Jakub Kądziołka <kuba <at> kadziolka.net> 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.

Following the core-updates merge, I have committed the change to staging
as commit f20d1cfb51ed14f325da000406807076323f70bc.

Regards,
Jakub Kądziołka

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.