mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 19:40:46 +02:00
Code Releases Activity

gnu: ghc-7: Clean up package definition.

Browse source 
* gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove
  the unused rpath module.
  [phases]: Use invoke instead of system*.
This commit is contained in:
Jakub Kądziołka 2020-04-08 12:21:42 +02:00
parent a243746816
commit f20d1cfb51
No known key found for this signature in database
GPG key ID: E315A75846131564
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/haskell.scm
View file

@ -178,11 +178,8 @@ top of CLISP.")
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build rpath)
(srfi srfi-26) (srfi srfi-26)
(srfi srfi-1)) (srfi srfi-1))
#:imported-modules (,@%gnu-build-system-modules
(guix build rpath))
#:configure-flags #:configure-flags
(list (list
(string-append "--with-gmp-libraries=" (string-append "--with-gmp-libraries="
@ -209,7 +206,7 @@ top of CLISP.")
(with-directory-excursion ".." (with-directory-excursion ".."
(copy-file (assoc-ref inputs "ghc-testsuite") (copy-file (assoc-ref inputs "ghc-testsuite")
"ghc-testsuite.tar.xz") "ghc-testsuite.tar.xz")
(system* "tar" "xvf" "ghc-testsuite.tar.xz")) (invoke "tar" "xvf" "ghc-testsuite.tar.xz"))
(substitute* (substitute*
(list "testsuite/timeout/Makefile" (list "testsuite/timeout/Makefile"
"testsuite/timeout/timeout.py" "testsuite/timeout/timeout.py"
@ -228,7 +225,7 @@ top of CLISP.")
(with-directory-excursion ghc-bootstrap-path (with-directory-excursion ghc-bootstrap-path
(copy-file (assoc-ref inputs "ghc-binary") (copy-file (assoc-ref inputs "ghc-binary")
"ghc-bin.tar.xz") "ghc-bin.tar.xz")
(zero? (system* "tar" "xvf" "ghc-bin.tar.xz")))) (invoke "tar" "xvf" "ghc-bin.tar.xz")))
(alist-cons-before (alist-cons-before
'install-bin 'configure-bin 'install-bin 'configure-bin
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -260,7 +257,7 @@ top of CLISP.")
(setenv "LD_LIBRARY_PATH" gmp-lib) (setenv "LD_LIBRARY_PATH" gmp-lib)
;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
(for-each (for-each
(cut system* "patchelf" "--set-interpreter" ld-so <>) (cut invoke "patchelf" "--set-interpreter" ld-so <>)
binaries) binaries)
;; The binaries include a reference to libtinfo.so.5 which ;; The binaries include a reference to libtinfo.so.5 which
;; is a subset of libncurses.so.5. We create a symlink in a ;; is a subset of libncurses.so.5. We create a symlink in a
@ -279,7 +276,7 @@ top of CLISP.")
(setenv "PATH" (setenv "PATH"
(string-append (getenv "PATH") ":" (string-append (getenv "PATH") ":"
ghc-bootstrap-prefix "/bin")) ghc-bootstrap-prefix "/bin"))
(system* (invoke
(string-append (getcwd) "/configure") (string-append (getcwd) "/configure")
(string-append "--prefix=" ghc-bootstrap-prefix) (string-append "--prefix=" ghc-bootstrap-prefix)
(string-append "--with-gmp-libraries=" gmp-lib) (string-append "--with-gmp-libraries=" gmp-lib)
@ -289,7 +286,7 @@ top of CLISP.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(with-directory-excursion (with-directory-excursion
(string-append ghc-bootstrap-path "/ghc-7.8.4") (string-append ghc-bootstrap-path "/ghc-7.8.4")
(zero? (system* "make" "install")))) (invoke "make" "install")))
%standard-phases))))))) %standard-phases)))))))
(native-search-paths (list (search-path-specification (native-search-paths (list (search-path-specification
(variable "GHC_PACKAGE_PATH") (variable "GHC_PACKAGE_PATH")