diff mbox series

[bug#72173,v2,2/2] guix: chicken-build-system: Update for 5.4.0.

Message ID b9662a0b62eceb56545f9d199b1c51aa17c1271a.1721929275.git.ashish.is@lostca.se
State New
Headers show
Series gnu: chicken: Update to 5.4.0. | expand

Commit Message

guix-patches--- via July 25, 2024, 5:41 p.m. UTC
From: Ashish SHUKLA <ashish.is@lostca.se>

* guix/build/chicken-build-system (build): chdir to the directory containing
  sources, and let chicken-install process the current directory.
  (install): Switch to define as we do not need any keys.
  (check): Remove unused egg-name from the arguments.

Change-Id: I4adf5e2378deab6e3f3b3c128c3cc75ce43f0e8a
---
 guix/build/chicken-build-system.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

jgart July 25, 2024, 8:48 p.m. UTC | #1
Hi,

Thanks for the v2. I can't apply this patch series with mumi am.

Can you share the method that you used to send it?

Thanks,

jgart
Ashish SHUKLA July 26, 2024, 8:35 a.m. UTC | #2
On Thu, Jul 25, 2024 at 03:48:58PM -0500, jgart wrote:
> 
> Hi,
> 
> Thanks for the v2. I can't apply this patch series with mumi am.
> 
> Can you share the method that you used to send it?

Sure.

git send-email -2 -v2 \
  --in-reply-to=a2cc7b416a4a87e086dd432c889b2f96270cbccb@dismail.de \
  --to=72173@debbugs.gnu.org --cover-letter --annotate \
  --base=origin/master

origin/master was 03062c7a9fd74d625639e1a325e9cb58d1cd74e3

Thanks!
Ashish SHUKLA July 26, 2024, 8:44 a.m. UTC | #3
On Fri, Jul 26, 2024 at 08:35:21AM +0000, Ashish wrote:
> On Thu, Jul 25, 2024 at 03:48:58PM -0500, jgart wrote:
> > 
> > Hi,
> > 
> > Thanks for the v2. I can't apply this patch series with mumi am.
> > 
> > Can you share the method that you used to send it?
> 
> Sure.
> 
> git send-email -2 -v2 \
>   --in-reply-to=a2cc7b416a4a87e086dd432c889b2f96270cbccb@dismail.de \
>   --to=72173@debbugs.gnu.org --cover-letter --annotate \
>   --base=origin/master
> 
> origin/master was 03062c7a9fd74d625639e1a325e9cb58d1cd74e3
> 
> Thanks!
> -- 
> Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
> 
> "If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixin)

❯ git rev-parse HEAD                                                                                                                                                                          
efc26826400762207cde9f23802cfe75a737963c                                                                                                                                                      

❯ git checkout -b testing-pr-72173                                                                                                                                                            
Switched to a new branch 'testing-pr-72173'                                                                                                                                                   

❯ curl -sL https://issues.guix.gnu.org/issue/72173/raw/{12..13} | git am
Applying: gnu: chicken: Update to 5.4.0.
Applying: guix: chicken-build-system: Update for 5.4.0.


Please note that the URLs above are not quite what are reflected in the 
web UI, so my guess something in the upstream mumi DB is messed up.

e.g. https://issues.guix.gnu.org/issue/72173/raw/13 is associated with 
your reply in the web UI, but if you download it, it's the one that 
contains the message containing the patch.

My guess is this is why mumi is getting confused.

HTH
diff mbox series

Patch

diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm
index 8f9f59cc25..fd5a33fd22 100644
--- a/guix/build/chicken-build-system.scm
+++ b/guix/build/chicken-build-system.scm
@@ -93,13 +93,14 @@  (define* (unpack #:key source egg-name unpack-path #:allow-other-keys)
 
 (define* (build #:key egg-name #:allow-other-keys)
   "Build the Chicken egg named by EGG-NAME"
-  (invoke "chicken-install" "-cached" "-no-install" egg-name))
+  (chdir egg-name)
+  (invoke "chicken-install" "-cached" "-no-install"))
 
-(define* (install #:key egg-name #:allow-other-keys)
+(define (install . _)
   "Install the already built egg named by EGG-NAME"
-  (invoke "chicken-install" "-cached" egg-name))
+  (invoke "chicken-install" "-cached"))
 
-(define* (check #:key egg-name tests? #:allow-other-keys)
+(define* (check #:key tests? #:allow-other-keys)
   "Build and run tests for the Chicken egg EGG-NAME"
   ;; there is no "-test-only" option, but we've already run install
   ;; so this just runs tests.
@@ -109,7 +110,7 @@  (define* (check #:key egg-name tests? #:allow-other-keys)
                          ":"
                          (getenv "CHICKEN_REPOSITORY_PATH")))
   (when tests?
-    (invoke "chicken-install" "-cached" "-test" "-no-install" egg-name)))
+    (invoke "chicken-install" "-cached" "-test" "-no-install")))
 
 (define* (stamp-egg-version #:key egg-name name #:allow-other-keys)
   "Check if EGG-NAME.egg contains version information and add some if not."