bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout.

[<ng0@pragmatique.xyz>]

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

I updated with the changes you suggested and reconfigured my system with the patches applied.

Executing on tty1 as privileged user, "loadkeys neo" works and does what it should do.

Is it good to go now?

[-- Attachment #2: 0001-gnu-kbd-Add-native-search-paths.patch --]
[-- Type: application/octet-stream, Size: 1490 bytes --]

From 0818ac92ef440013f5f1013a0fcfcf2ebd7004e2 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Thu, 25 May 2017 12:48:16 +0000
Subject: [PATCH 1/2] gnu: kbd: Add 'native-search-paths'.

* gnu/packages/linux.scm (kbd)[native-search-paths]: Add it.
---
 gnu/packages/linux.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 28babb4db..04066d800 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -18,7 +18,7 @@
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
-;;; Copyright © 2016 ng0 <ng0@libertad.pw>
+;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
 ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.com>
 ;;; Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
@@ -1689,6 +1689,10 @@ system.")
               ("gzip" ,gzip)
               ("bzip2" ,bzip2)
               ("pam" ,linux-pam)))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "LOADKEYS_KEYMAP_PATH")
+            (files (list "share/keymaps")))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "http://kbd-project.org/")
     (synopsis "Linux keyboard utilities and keyboard maps")
-- 
2.13.0


[-- Attachment #3: 0002-gnu-Add-kbd-neo.patch --]
[-- Type: application/octet-stream, Size: 2147 bytes --]

From 41a539acfbfe7ebb30c07d585d9f1d874a3ebfe9 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@libertad.pw>
Date: Sun, 1 Jan 2017 16:36:27 +0000
Subject: [PATCH 2/2] gnu: Add kbd-neo.

* gnu/packages/linux.scm (kbd-neo): New variable.
---
 gnu/packages/linux.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 04066d800..1b6dd5411 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1641,6 +1641,37 @@ system.")
     (license (list license:gpl2                   ;programs
                    license:lgpl2.1))))            ;library
 
+(define-public kbd-neo
+  (package
+    (name "kbd-neo")
+    (version "2486")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://svn.neo-layout.org/!svn/bc/"
+                           version "/linux/console/neo.map"))
+       (file-name (string-append name "-" version ".map"))
+       (sha256
+        (base32
+         "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils))
+                   (let ((out (string-append %output "/share/keymaps"))
+                         (source (assoc-ref %build-inputs "source")))
+                     (mkdir-p out)
+                     (copy-file source (string-append out "/neo.map"))))))
+    (home-page "https://neo-layout.org")
+    (synopsis "Neo2 console layout for loadkeys(1)")
+    (description
+     "Kbd-neo provides the Neo2 keyboard layout for use with loadkeys(1)
+with kbd(4).")
+    ;; The file is located in an svn directory, the entire content of
+    ;; the directory is licensed as GPL3.
+    (license license:gpl3)))
+
 (define-public kbd
   (package
     (name "kbd")
@@ -1689,6 +1720,7 @@ system.")
               ("gzip" ,gzip)
               ("bzip2" ,bzip2)
               ("pam" ,linux-pam)))
+
     (native-search-paths
      (list (search-path-specification
             (variable "LOADKEYS_KEYMAP_PATH")
-- 
2.13.0