[bug#55276] [PATCH] gnu: Add xkblayout.

[bug#55276] [PATCH] gnu: Add xkblayout.

[Attila Lendvai]

* gnu/packages/xdisorg.scm (xkblayout): New variable.
---
 gnu/packages/xdisorg.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d41c520962..b88f1b9445 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -387,6 +387,29 @@ (define-public xkb-switch
 state.")
     (license license:gpl3+)))
 
+(define-public xkblayout
+  ;; Upstream has no tags as of 2022-05-04
+  (let ((revision "0")
+        (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8"))
+    (package
+      (name "xkblayout")
+      (version (string-append "0.0.0-" revision "-" (substring commit 0 7)))
+      (home-page "https://gitlab.freedesktop.org/whot/xkblayout")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0057988l5l7pmwg7dp6cqvj5l4lr0g5z3wq189g6kz36l9rmh675"))))
+      (build-system python-build-system)
+      (synopsis "XKB layout template generator")
+      (description "xkblayout is a CLI application to generate templates for
+a new XKB layout, either in the user's home directory or the system directory.")
+      (license license:gpl3+))))
+
 (define-public xclip
   (package
     (name "xclip")
-- 
2.35.1

[bug#55276] [PATCH] gnu: Add xkblayout.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 650 bytes --]

Attila Lendvai schreef op do 05-05-2022 om 18:46 [+0200]:
> +(define-public xkblayout
> +  ;; Upstream has no tags as of 2022-05-04
> +  (let ((revision "0")
> +        (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8"))

I don't think the lack of tags matters, what relevant is whether there
is some kind of version number system.  So I'd go for

  ;; Upstream doesn't have any version numbers

However, upstream does have versions:

https://gitlab.freedesktop.org/whot/xkblayout/-/blob/master/setup.py#L6

... but it's an old version, so maybe upstream could be asked if it's a
’good’ version?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55276] [PATCH] gnu: Add xkblayout.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

Attila Lendvai schreef op do 05-05-2022 om 18:46 [+0200]:
> +      (version (string-append "0.0.0-" revision "-" (substring commit 0 7)))

'git-version'?

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55276] [PATCH] gnu: Add xkblayout.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

Attila Lendvai schreef op do 05-05-2022 om 18:46 [+0200]:
> +      (license license:gpl3+))))

xkblayout.py says otherwise (some kind of BSD maybe?)

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55276] [PATCH v2] gnu: Add xkblayout.

[Attila Lendvai]

* gnu/packages/xdisorg.scm (xkblayout): New variable.
---

i've addressed the issues i could, but i'm not sure anymore
whether this should be packaged for Guix at all. maybe
people should just clone the repo and run it from there?

feel free to reject it.

either way, i've requested some clarifications:

https://gitlab.freedesktop.org/whot/xkblayout/-/issues/

licensing is contradictory, COPYING says GPL.

 gnu/packages/xdisorg.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d41c520962..08f4780fc2 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -387,6 +387,30 @@ (define-public xkb-switch
 state.")
     (license license:gpl3+)))
 
+(define-public xkblayout
+  ;; Upstream doesn't have any version numbers
+  (let ((version "0.0.0")
+        (revision "0")
+        (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8"))
+    (package
+      (name "xkblayout")
+      (version (git-version version revision commit))
+      (home-page "https://gitlab.freedesktop.org/whot/xkblayout")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0057988l5l7pmwg7dp6cqvj5l4lr0g5z3wq189g6kz36l9rmh675"))))
+      (build-system python-build-system)
+      (synopsis "XKB layout template generator")
+      (description "xkblayout is a CLI application to generate templates for
+a new XKB layout, either in the user's home directory or the system directory.")
+      (license license:gpl3+))))
+
 (define-public xclip
   (package
     (name "xclip")
-- 
2.35.1

[bug#55276] [PATCH v2] gnu: Add xkblayout.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

Attila Lendvai schreef op vr 06-05-2022 om 08:22 [+0200]:
> +  ;; Upstream doesn't have any version numbers
> +  (let ((version "0.0.0")
> +        (revision "0")
> +        (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8"))

TBC I don't think this is a blocker, it's more of an ‘it would be
convenient to have them’ thing.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55276] [PATCH v2] gnu: Add xkblayout.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

Attila Lendvai schreef op vr 06-05-2022 om 08:22 [+0200]:
> * gnu/packages/xdisorg.scm (xkblayout): New variable.
> ---
> 
> i've addressed the issues i could, but i'm not sure anymore
> whether this should be packaged for Guix at all.

I don't see why not, it's software and Guix is a software distribution
and some people create their own layouts.  Though you can close the
debbugs issue if you want to.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#55276: [PATCH] gnu: Add xkblayout.

[Ludovic Courtès]

Hi,

Attila Lendvai <attila@lendvai.name> skribis:

> * gnu/packages/xdisorg.scm (xkblayout): New variable.

Applied, thanks!  And thanks to Maxime for reviewing.

Ludo’.