guix_mirror_bot pushed a commit to branch haskell-team
in repository guix.
commit 5f985e91fafcbda7f21dbc932d58e27181567874
Author: Saku Laesvuori <[email protected]>
AuthorDate: Thu Oct 9 12:31:08 2025 +0300
haskell-build-system: Do not re-set GHC_PACKAGE_PATH after configure
The Cabal shipped with GHC 9.10 refuses to run tests if GHC_PACKAGE_PATH
is set. Since Cabal anyway uses the package database that it was given
in configure, this environment variable is not needed for any later
phases and we may just unset it.
* guix/build/haskell-build-system.scm (configure): Do not set
GHC_PACKAGE_PATH after unsetting it.
Change-Id: I5b2c662c31d84be79eb39688d6dd43285fbddcb3
Signed-off-by: Lars-Dominik Braun <[email protected]>
---
guix/build/haskell-build-system.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index 0e94cf59a5..8e0311213e 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -84,7 +84,6 @@ and parameters ~s~%"
(lib (assoc-ref outputs "lib"))
(name-version (strip-store-file-name out))
(extra-dirs (filter-map (cut assoc-ref inputs <>) extra-directories))
- (ghc-path (getenv "GHC_PACKAGE_PATH"))
(params `(,(string-append "--prefix=" out)
,(string-append "--libdir=" (or lib out) "/lib")
,(string-append "--docdir=" (or doc out)
@@ -120,9 +119,7 @@ and parameters ~s~%"
;; <https://www.haskell.org/cabal/users-guide/developing-packages.html>.
(when (file-exists? "configure")
(setenv "CONFIG_SHELL" "sh"))
- (run-setuphs "configure" params)
-
- (setenv "GHC_PACKAGE_PATH" ghc-path)))
+ (run-setuphs "configure" params)))
(define* (build #:key parallel-build? #:allow-other-keys)
"Build a given Haskell package."
