* [bug#67332] [PATCH] gnu: ephemeralpg: Fix cross-compilation. @ 2023-11-21 15:45 Zheng Junjie 2023-11-21 17:21 ` [bug#67332] " Maxime Devos 0 siblings, 1 reply; 5+ messages in thread From: Zheng Junjie @ 2023-11-21 15:45 UTC (permalink / raw) To: 67332 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain; charset=y, Size: 3031 bytes --] * 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#67332] gnu: ephemeralpg: Fix cross-compilation. 2023-11-21 15:45 [bug#67332] [PATCH] gnu: ephemeralpg: Fix cross-compilation Zheng Junjie @ 2023-11-21 17:21 ` Maxime Devos 2023-11-21 22:42 ` Maxime Devos 0 siblings, 1 reply; 5+ messages in thread From: Maxime Devos @ 2023-11-21 17:21 UTC (permalink / raw) To: 67332, Zheng Junjie [-- Attachment #1.1.1: Type: text/plain, Size: 504 bytes --] > [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> 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/>: <https://issues.guix.gnu.org/search?query=ephemeralpg> Best regards, Maxime Devos [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 929 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#67332] gnu: ephemeralpg: Fix cross-compilation. 2023-11-21 17:21 ` [bug#67332] " Maxime Devos @ 2023-11-21 22:42 ` Maxime Devos [not found] ` <877cm8d5jc.fsf@qq.com> 0 siblings, 1 reply; 5+ messages in thread From: Maxime Devos @ 2023-11-21 22:42 UTC (permalink / raw) To: 67332, Zheng Junjie [-- Attachment #1.1.1: Type: text/plain, Size: 677 bytes --] 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> > > 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/>: 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. [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 929 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <877cm8d5jc.fsf@qq.com>]
* bug#67332: what is the status of the core-updates now [not found] ` <877cm8d5jc.fsf@qq.com> @ 2023-11-23 12:02 ` Z572 via Guix-patches via 2023-11-28 1:59 ` [bug#67332] " Maxime Devos 0 siblings, 1 reply; 5+ messages in thread From: Z572 via Guix-patches via @ 2023-11-23 12:02 UTC (permalink / raw) To: Maxime Devos; +Cc: 67332-done, guix-devel 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]] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#67332] what is the status of the core-updates now 2023-11-23 12:02 ` bug#67332: what is the status of the core-updates now Z572 via Guix-patches via @ 2023-11-28 1:59 ` Maxime Devos 0 siblings, 0 replies; 5+ messages in thread From: Maxime Devos @ 2023-11-28 1:59 UTC (permalink / raw) To: Z572; +Cc: 67332-done, guix-devel [-- Attachment #1.1.1: Type: text/plain, Size: 783 bytes --] Op 23-11-2023 om 13:02 schreef Z572: > > 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? I don't know. [-- Attachment #1.1.2: OpenPGP public key --] [-- Type: application/pgp-keys, Size: 929 bytes --] [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 236 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-28 2:00 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-11-21 15:45 [bug#67332] [PATCH] gnu: ephemeralpg: Fix cross-compilation Zheng Junjie 2023-11-21 17:21 ` [bug#67332] " Maxime Devos 2023-11-21 22:42 ` Maxime Devos [not found] ` <877cm8d5jc.fsf@qq.com> 2023-11-23 12:02 ` bug#67332: what is the status of the core-updates now Z572 via Guix-patches via 2023-11-28 1:59 ` [bug#67332] " Maxime Devos
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).