diff mbox series

[bug#53748] Acknowledgement ([PATCH]: Update g-golf to 0.0.1-1010-1824633.)

Message ID 86zgn8kn07.fsf@163.com
State Accepted
Headers show
Series [bug#53748] Acknowledgement ([PATCH]: Update g-golf to 0.0.1-1010-1824633.) | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Zhu Zihao Feb. 3, 2022, 3:06 p.m. UTC

Comments

Ludovic Courtès Feb. 8, 2022, 12:25 p.m. UTC | #1
Hi,

Zhu Zihao <all_but_last@163.com> skribis:

>>From 62df1822ea5e58d97ae844c92f7bd30eb6556e57 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Thu, 3 Feb 2022 22:27:40 +0800
> Subject: [PATCH 1/4] gnu: g-golf: Update to 0.0.1-1010-1824633.
>
> * gnu/packages/guile-xyz.scm (g-golf)[arguments]: Use G-Expression.
>
> <phases>: Add phase 'fix-guile-site-directory'. Patch 'configure.ac' before
> bootstrapping, avoid breaking configure script in accident.
>
> In phase 'substitute-libs', use `search-input-file` for searching libraries.
>
> In phase 'start-xorg-server', simplify the X server startup script.
>
> [inputs]: Remove gtk+ and clutter.
>
> Use label-less style.
>
> [native-inputs]: Add gtk+ and clutter, they're now only needed in test.
>
> Use label-less style.

[...]

>>From da6dacaeff05b42b188edd48a52e7babab8c5cc6 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Thu, 3 Feb 2022 22:35:10 +0800
> Subject: [PATCH 2/4] gnu: Deprecate the 'g-golf' variable.
>
> g-golf now supports both Guile 3.0 and 2.2. Assign a new name to identify
> the g-golf for different Guile version.
>
> * gnu/packages/guile-xyz.scm (g-golf): Rename to guile-g-golf.
> (g-golf): Define as deprecated by guile-g-golf.

[...]

>>From 3021cdb1b5ed4332a1417550246c487ff2742642 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Thu, 3 Feb 2022 22:38:59 +0800
> Subject: [PATCH 3/4] gnu: Add guile2.2-g-golf.
>
> * gnu/packages/guile-xyz.scm (guile2.2-g-golf): New variable.

Applied, thanks!

Ludo’.
diff mbox series

Patch

From 71724859e01b7c4154825a15908de35c63bf7386 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Thu, 3 Feb 2022 22:39:54 +0800
Subject: [PATCH 4/4] gnu: nomad: Depends on proper version of g-golf.

* gnu/packages/guile-xyz.scm (nomad)[inputs]: Replace 'g-golf' with 'guile2.2-g-golf'.
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index bec9dc7445..996e6014d7 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3457,7 +3457,7 @@  (define-public nomad
        ("guile-readline" ,guile2.2-readline)
        ("guile-gcrypt" ,guile2.2-gcrypt)
        ("gnutls" ,gnutls)
-       ("g-golf" ,g-golf)
+       ("g-golf" ,guile2.2-g-golf)
        ("shroud" ,shroud)
        ("emacsy" ,emacsy-minimal)
        ;; Gtk
-- 
2.34.0