[core-updates] error building xkeyboard-config

  • Done
  • quality assurance status badge
Details
3 participants
  • Brian Cully
  • Felix Lechner
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Brian Cully
Severity
normal
B
B
Brian Cully wrote on 13 Apr 2023 23:18
(address . bug-guix@gnu.org)
87sfd3a2yb.fsf@psyduck.jhoto.kublai.com
Looks like something changed between 2.34 (on master) and 2.36 (on
core-updates) which caused ‘share/X11/rules/base’ to generate
improperly.

On core-updates:
Toggle snippet (5 lines)
~/src/guix-core-updates $ ./pre-inst-env guix build
xkeyboard-config
/gnu/store/0yg8hlbvynr5bq8816srgcyjf50sp54h-xkeyboard-config-2.36

Which includes the following broken lines in ‘rules/base’:
Toggle snippet (29 lines)
! $inetmediakbds = \
a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k
acer_laptop /
armada asus_laptop benqx btc5090 btc6301urf
btc9019u /
cherrybluea cherryblueb cherrycyboard chicony042 /
compalfl90 compaqik13 compaqik18 creativedw7000 /
cymotionlinux dellm65 dellusbmm dexxa diamond
dtk2000 /
emachines ennyah_dkb1008 fscaa1667g genius
geniuscomfy /
geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc
hpxe3gf /
hpxe4xxx hpxt1000 hpzt11xx inspiron latitude /
logidinovo logidinovoedge logitech_base
logitech_g15 /
microsoft4000 microsoft7000 microsoftmult
microsoftpro /
microsoftprooem mx1998 mx2500 mx2750 pc105
precision_m /
presario propeller samsung4500 samsung4510
scorpius /
silvercrest sk1300 sk2500 sk7100 sp_inet
targa_v811 /
thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 /
toshiba_s3000 trust trustda trust_slimline
unitekkb1925

Note the forward slash as a line continuation character, rather
than a backslash, which is used everywhere. The same file on
master:
Toggle snippet (4 lines)
~/src/guix $ ./pre-inst-env guix build xkeyboard-config
/gnu/store/8mszv7v6kqdyavpvf8zb7kkagaan5vri-xkeyboard-config-2.34

This is the equivalent block:
Toggle snippet (29 lines)
! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u
cherryblueb \
cherrybluea herrycyboard chicony042 compaqik13
compaqik18 \
armada presario dellm65 inspiron dellusbmm diamond
\
ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc
hpxe3gf \
hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60
ogitech_base \
logidinovo logidinovoedge logitech_g15 mx1998
mx2500 mx2750 \
microsoft4000 microsoft7000 microsoftprooem
microsoftmult \
propeller samsung4500 samsung4510 sk1300 sk2500
sk7100 \
toshiba_s3000 trust trustda cymotionlinux
silvercrest \
emachines benqx unitekkb1925 creativedw7000
compalfl90 \
pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop
btc6301urf \
dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy
latitude \
microsoftpro precision_m scorpius sp_inet
targa_v811 thinkpad \
tm2030USB-102 tm2030USB-106 trust_slimline

This is causing issues when building my system config, as
‘(keyboard-layout "us")’ with core-updates returns a syntax error
due to the above.

I'm not sure what's going on here, as it doesn't appear as though
the package has any custom rules. It did change from
‘gnu-build-system’ to ‘meson-build-system’ with the version bump,
though, so maybe there's something in there?

-bjc
F
F
Felix Lechner wrote on 15 Apr 2023 03:15
[PATCH] gnu: xkeyboard-config: Update to 2.37. (Closes: #62820, #58402)
(address . 62820@debbugs.gnu.org)
d0accbcad29962432bc91878fb6b05505d215cf6.1681521349.git.felix.lechner@lease-up.com
For legacy reasons, Guix used to offer several version of Meson, but in a
recent core-updates branch all versions prior to 1.1.0 had been retired. [1]
By comparison, the most recent version available in the master branch is
0.63.2, which was released just seven months before meson 1.1.0 was cut. [2]

Meanwhile, some software may not have been ready for that transition. I have
not been able to confirm the suspicion for version 2.36 of xkeyboard-config
via online searches or the respective Git log, but updating xkeyboard-config
to 2.37 solved what has been reported as the last remaining issue in
core-updates [3] for me locally.

Here is the same excerpt quoted in Issue#62820 but without the offending
forward slashes for multi-line continuations. It was produced after this patch
was applied to commit 3bacd3c7 of core-updates:

! $inetmediakbds = \
a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \
armada asus_laptop benqx btc5090 btc6301urf btc9019u \
cherrybluea cherryblueb cherrycyboard chicony042 \
compalfl90 compaqik13 compaqik18 creativedw7000 \
cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \
emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \
geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \
hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \
logidinovo logidinovoedge logitech_base logitech_g15 \
microsoft4000 microsoft7000 microsoftmult microsoftpro \
microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \
presario propeller samsung4500 samsung4510 scorpius \
silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \
thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \
toshiba_s3000 trust trustda trust_slimline unitekkb1925

The data above was extracted from the file

/gnu/store/5j9synbgzbdjjf2gkyfy9mj83d213qkh-xkeyboard-config-2.37/share/X11/xkb/rules/base

That path contains an extra component 'xkb' relative to the location
identified in Issue#62820 but I believe the path 'share/X11/rules/base' there
was misquoted accidentally.

For the sake of completeness, I'll also mention that xkeyboard-config was
likewise updated in core-updates. The version originally went from 2.34 to
2.36 [4] before being updated to 2.37 herein.


* gnu/packages/xorg.scm (xkeyboard-config): Update to 2.37.
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c510547559..94a59bd205 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3709,7 +3709,7 @@ (define-public xkbutils
(define-public xkeyboard-config
(package
(name "xkeyboard-config")
- (version "2.36")
+ (version "2.37")
(source (origin
(method url-fetch)
(uri (string-append
@@ -3717,7 +3717,7 @@ (define-public xkeyboard-config
"xkeyboard-config-" version ".tar.xz"))
(sha256
(base32
- "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
+ "0v4clrxrjygpy5arnb2x3ksvsah5mdprsarhqzbi0qjbmjjq64zb"))))
(build-system meson-build-system)
(inputs (list libx11 xkbcomp-intermediate))
(native-inputs (list gettext-minimal libxslt perl pkg-config python))

base-commit: 3bacd3c76a58ebe70f98be654f09cbd4166093ab
--
2.39.2
M
M
Maxim Cournoyer wrote on 15 Apr 2023 06:18
Re: bug#62820: [core-updates] error building xkeyboard-config
(name . Felix Lechner)(address . felix.lechner@lease-up.com)
87o7np6ao7.fsf_-_@gmail.com
Hi,

Felix Lechner <felix.lechner@lease-up.com> writes:

[...]

Toggle quote (25 lines)
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index c510547559..94a59bd205 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -3709,7 +3709,7 @@ (define-public xkbutils
> (define-public xkeyboard-config
> (package
> (name "xkeyboard-config")
> - (version "2.36")
> + (version "2.37")
> (source (origin
> (method url-fetch)
> (uri (string-append
> @@ -3717,7 +3717,7 @@ (define-public xkeyboard-config
> "xkeyboard-config-" version ".tar.xz"))
> (sha256
> (base32
> - "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
> + "0v4clrxrjygpy5arnb2x3ksvsah5mdprsarhqzbi0qjbmjjq64zb"))))
> (build-system meson-build-system)
> (inputs (list libx11 xkbcomp-intermediate))
> (native-inputs (list gettext-minimal libxslt perl pkg-config python))
>
> base-commit: 3bacd3c76a58ebe70f98be654f09cbd4166093ab

I've updated to 2.38 on core-updates now (I'll push soon). Thanks for
the report and fix suggestion.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 62820@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 62820
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch