--- Begin Message ---
|
Subject: |
[PATCH] gnu: ephemeralpg: Fix cross-compilation. |
|
Date: |
Tue, 21 Nov 2023 23:45:06 +0800 |
* gnu/packages/databases.scm (ephemeralpg): Fix cross-compilation.
[arguments]: Use Gexp, remove tailed #t.
[inputs]: Add bash-minimal.
Change-Id: Icdb3dc2db120b07f0d4f03a94a693459974ae06f
---
gnu/packages/databases.scm | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f0ea100c3b..c5e493440e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -62,6 +62,7 @@
;;; Copyright ?? 2023 Felix Gruber <felgru@posteo.ne
;;; Copyright ?? 2023 Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright ?? 2023 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright ?? 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -202,26 +203,25 @@ (define-public ephemeralpg
(base32 "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/pg_tmp")
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "util-linux")
- "/bin")
- ,(string-append (assoc-ref inputs "postgresql")
- "/bin")
- ;; For getsocket.
- ,(string-append out "/bin")))))
- #t)))
- #:test-target "test"))
+ (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/pg_tmp")
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "util-linux")
+ "/bin")
+ ,(string-append (assoc-ref inputs "postgresql")
+ "/bin")
+ ;; For getsocket.
+ ,(string-append out "/bin"))))))))
+ #:test-target "test"))
(inputs
- (list postgresql util-linux))
+ (list bash-minimal postgresql util-linux))
(native-inputs
;; For tests.
(list ruby which))
base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e
--
2.41.0
--- End Message ---
--- Begin Message ---
|
Subject: |
what is the status of the core-updates now |
|
Date: |
Thu, 23 Nov 2023 20:02:25 +0800 |
|
User-agent: |
mu4e 1.10.7; emacs 30.0.50 |
Maxime Devos <maximedevos@telenet.be> writes:
> [[PGP Signed Part:Undecided]]
>
>
> Op 21-11-2023 om 18:21 schreef Maxime Devos:
>> > [PATCH] gnu: ephemeralpg: Fix cross-compilation.
>> There is already a patch for that:
>> <https://issues.guix.gnu.org/49327#8>
>> and (a rebased version of) it effectively has already been applied:
>> <https://issues.guix.gnu.org/49327#150>
ok, close it.
>> I guess you could copy it from c-u to master if you don't want to
>> wait for the c-u merge, but please use the search function at
>> <https://issues.guix.gnu.org/>:
what is the status of the core-updates now,it on ci.guix.gnu.org only build
'core', is this a configuration error?
core-update build failed , so i create patch 67365 and 67358 to fix
it (and thanks for Hilton Chain apply them!).
but eval failed in ci.guix.gnu.org.
```
Unable to fetch from bordeaux.guix.gnu.org, misc-error: (#f download failed ~S
~S ~S
(http://bordeaux.guix.gnu.org/nar/r45xmcmqd1374qpbnfjds5rc3jsf7qr0-texlive-scripts-66594-checkout
404 Not Found) #f)
Trying content-addressed mirror at ci.guix.gnu.org...
Unable to fetch from ci.guix.gnu.org, misc-error: (#f download failed ~S ~S ~S
(http://ci.guix.gnu.org/nar/r45xmcmqd1374qpbnfjds5rc3jsf7qr0-texlive-scripts-66594-checkout
404 Not Found) #f)
```
Can someone take a look?
>
> In retrospect, the title of the patch I referred to doesn't indicate
> it's about ephemeralpg and there are multiple search results, so the
> last remark is not really applicable here.
>
> [2. OpenPGP public key --- application/pgp-keys;
> OpenPGP_0x49E3EE22191725EE.asc]...
>
> [[End of PGP Signed Part]]
--- End Message ---