[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/24: guix: haskell-build-system: Always pass -package-db option.
From: |
guix-commits |
Subject: |
01/24: guix: haskell-build-system: Always pass -package-db option. |
Date: |
Thu, 7 Oct 2021 09:21:12 -0400 (EDT) |
lbraun pushed a commit to branch wip-haskell
in repository guix.
commit 14dd3fabe7c5b641b621d4042ac4ee9f9329c1a8
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Wed Jul 21 00:20:29 2021 +0200
guix: haskell-build-system: Always pass -package-db option.
* guix/build/haskell-build-system.scm (run-setuphs): Pass -package-db
option.
Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
---
guix/build/haskell-build-system.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/build/haskell-build-system.scm
b/guix/build/haskell-build-system.scm
index 28253ce..171100e 100644
--- a/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,13 +64,14 @@
((file-exists? "Setup.lhs")
"Setup.lhs")
(else
- #f))))
+ #f)))
+ (pkgdb (string-append "-package-db=" %tmp-db-dir)))
(if setup-file
(begin
(format #t "running \"runhaskell Setup.hs\" with command ~s \
and parameters ~s~%"
command params)
- (apply invoke "runhaskell" setup-file command params))
+ (apply invoke "runhaskell" pkgdb setup-file command params))
(error "no Setup.hs nor Setup.lhs found"))))
(define* (configure #:key outputs inputs tests? (configure-flags '())
- branch wip-haskell created (now 1511199), guix-commits, 2021/10/07
- 02/24: gnu: ghc-8: Update to 8.10., guix-commits, 2021/10/07
- 05/24: import: stackage: Support input changes., guix-commits, 2021/10/07
- 01/24: guix: haskell-build-system: Always pass -package-db option.,
guix-commits <=
- 10/24: gnu: Update Haskell ecosystem., guix-commits, 2021/10/07
- 09/24: build-system/haskell: Explain failure., guix-commits, 2021/10/07
- 11/24: gnu: cabal-install: Build with GHC 8.10., guix-commits, 2021/10/07
- 12/24: gnu: hedgewars: Fix build., guix-commits, 2021/10/07
- 16/24: gnu: ngless: Fix build., guix-commits, 2021/10/07
- 18/24: gnu: ghc-repline: Remove version 0.2.0.0., guix-commits, 2021/10/07
- 15/24: gnu: idris: Fix build., guix-commits, 2021/10/07
- 21/24: gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/07
- 14/24: gnu: ghc-silently: Remove unused input., guix-commits, 2021/10/07
- 03/24: import: stackage: Update %default-lts-version to 18.10., guix-commits, 2021/10/07