[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/24: build-system/haskell: Do not rely on compiler name.
From: |
guix-commits |
Subject: |
06/24: build-system/haskell: Do not rely on compiler name. |
Date: |
Fri, 8 Oct 2021 03:20:39 -0400 (EDT) |
lbraun pushed a commit to branch master
in repository guix.
commit 7cdb65dc9cceebfd3a45eeb281530f91f1b43b81
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Fri Sep 17 08:55:08 2021 +0200
build-system/haskell: Do not rely on compiler name.
We’ve been relying on the compiler name matching its package
subdir. Since we effectively only support GHC we can hard-code this and
avoid issues with “ghc-next”.
* guix/build/haskell-build-system.scm (make-ghc-package-database):
Use GHC_PACKAGE_PATH.
(register): Hard-code ghc prefix.
---
guix/build/haskell-build-system.scm | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index 171100e..7d50bae 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -175,15 +175,8 @@ first match and return the content of the group."
"Generate the GHC package database."
(let* ((haskell (assoc-ref inputs "haskell"))
(name-version (strip-store-file-name haskell))
- (input-dirs (match inputs
- (((_ . dir) ...)
- dir)
- (_ '())))
;; Silence 'find-files' (see 'evaluate-search-paths')
- (conf-dirs (with-null-error-port
- (search-path-as-list
- `(,(string-append "lib/" name-version))
- input-dirs #:pattern ".*\\.conf.d$")))
+ (conf-dirs (search-path-as-string->list (getenv "GHC_PACKAGE_PATH")))
(conf-files (append-map (cut find-files <> "\\.conf$") conf-dirs)))
(mkdir-p %tmp-db-dir)
(for-each (lambda (file)
@@ -243,10 +236,11 @@ given Haskell package."
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(haskell (assoc-ref inputs "haskell"))
- (name-verion (strip-store-file-name haskell))
+ (name-version (strip-store-file-name haskell))
+ (version (last (string-split name-version #\-)))
(lib (string-append (or (assoc-ref outputs "lib") out) "/lib"))
(config-dir (string-append lib
- "/" name-verion
+ "/ghc-" version
"/" name ".conf.d"))
(id-rx (make-regexp "^id: *(.*)$"))
(config-file (string-append out "/" name ".conf"))
- branch master updated (3fc0fa9 -> c8a7ba6), guix-commits, 2021/10/08
- 01/24: guix: haskell-build-system: Always pass -package-db option., guix-commits, 2021/10/08
- 03/24: import: stackage: Update %default-lts-version to 18.10., guix-commits, 2021/10/08
- 02/24: gnu: ghc-8: Update to 8.10., guix-commits, 2021/10/08
- 06/24: build-system/haskell: Do not rely on compiler name.,
guix-commits <=
- 04/24: import: hackage: Update GHC’s standard libraries., guix-commits, 2021/10/08
- 08/24: import: hackage: Support mirror:// URLs, guix-commits, 2021/10/08
- 05/24: import: stackage: Support input changes., guix-commits, 2021/10/08
- 09/24: build-system/haskell: Explain failure., guix-commits, 2021/10/08
- 07/24: build-system/haskell: Accept line breaks in config files., guix-commits, 2021/10/08
- 10/24: gnu: Update Haskell ecosystem., guix-commits, 2021/10/08
- 11/24: gnu: cabal-install: Build with GHC 8.10., guix-commits, 2021/10/08
- 12/24: gnu: hedgewars: Fix build., guix-commits, 2021/10/08
- 15/24: gnu: idris: Fix build., guix-commits, 2021/10/08
- 13/24: gnu: ruby-pandoc-ruby: Disable tests., guix-commits, 2021/10/08