Add neo-layout to kbd

Add neo-layout to kbd

[ng0]

We talked about this in september, this adds the neo layout to kbd.
The problem I have can be reproduced by trying to build kbd after adding both patches.

[PATCH 1/2] gnu: Add kbd-neo.

[ng0]

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f0d01ece2..196ae8c49 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
-;;; Copyright © 2016 ng0 <ng0@libertad.pw>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +83,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
+  #:use-module (guix svn-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -1578,6 +1579,24 @@ system.")
     (license (list license:gpl2                   ;programs
                    license:lgpl2.1))))            ;library
 
+;; The Neo layout is a GPL3 licensed layout already present in Xorg,
+;; but not in kbd. home-page: https://neo-layout.org
+(define kbd-neo
+  (let ((svn-revision 2476)
+        (revision "1"))
+    (origin
+      (method svn-fetch)
+      (uri (svn-reference
+            ;; The SVN branch with the neo.map file.
+            (url "https://svn.neo-layout.org/linux/console")
+            (revision svn-revision)))
+      (file-name
+       (string-append name "-" (number->string svn-revision)
+                      "." revision "-checkout"))
+      (sha256
+       (base32
+        "169hmlwcwz5sp605i8q5ikckxwsj1n3isylrnynflp30gbv9zrwn")))))
+
 (define-public kbd
   (package
     (name "kbd")
-- 
2.11.0

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

[ng0]

* gnu/packages/linux.scm (kbd): Add neo layout.
[arguments]: Add new 'install-neo-layout' phase.
---
 gnu/packages/linux.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 196ae8c49..231ba5765 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1640,10 +1640,19 @@ system.")
                (for-each (lambda (prog)
                            (wrap-program (string-append bin "/" prog)
                              `("PATH" ":" prefix (,bin))))
-                         '("unicode_start" "unicode_stop"))))))))
+                         '("unicode_start" "unicode_stop")))))
+         (add-after 'build 'install-neo-layout
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let ((neo (assoc-ref inputs "kbd-neo"))
+                            (out (assoc-ref outputs "out"))
+                            (neomap (string-append neo "/console/neo.map"))
+                            (keymaps (string-append out "/share/keymaps/i386/neo")))
+                        (mkdir-p keymaps)
+                        (install-file neomap keymaps)))))))
     (inputs `(("check" ,check)
               ("gzip" ,gzip)
               ("bzip2" ,bzip2)
+              ("kbd-neo" ,kbd-neo)
               ("pam" ,linux-pam)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/")
-- 
2.11.0

Re: Add neo-layout to kbd

[ng0]

ng0 <ng0@libertad.pw> writes:

> We talked about this in september, this adds the neo layout to kbd.
> The problem I have can be reproduced by trying to build kbd after adding both patches.
>
>
>

Looking at nixpkgs, I wonder if my svn-fetch is overkill. Is the
url format unique to Nix, or is this something svnweb understands?

https://github.com/NixOS/nixpkgs/blob/56904d7c423f2b13b37fbd29f39bbb4b52bc7824/pkgs/os-specific/linux/kbd/keymaps.nix
or as pasted here:

neo = stdenv.mkDerivation rec {
    name = "neo-${version}";
    version = "2476";

    src = fetchurl {
      name = "neo.map";
      url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
      sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g";
    };

    buildCommand = ''
      install -D $src $out/share/keymaps/i386/neo/neo.map
    '';
  };
}

-- 
♥Ⓐ  ng0
PGP keys and more: https://n0is.noblogs.org/ http://ng0.chaosnet.org

Re: [PATCH 2/2] gnu: kbd: Add neo layout.

[Hartmut Goebel]

Am 01.01.2017 um 18:22 schrieb ng0:
> +         (add-after 'build 'install-neo-layout

I suggest adding after (or before) install.

> +              ("kbd-neo" ,kbd-neo)

Since you are installing (copying) the file, this could be a
native-input, I think.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 1/2] gnu: Add kbd-neo.

[Hartmut Goebel]

Am 01.01.2017 um 18:22 schrieb ng0:
> +            (url "https://svn.neo-layout.org/linux/console")

What do you thing about removing the included bin directory?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: Add neo-layout to kbd

[Hartmut Goebel]

Am 01.01.2017 um 18:25 schrieb ng0:
>       url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";

I did not succeed downloading to checking out this url, but I could
download this one:

http://wiki.neo-layout.org/export/2476/linux/console/neo.map


-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: Add neo-layout to kbd

[ng0]

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> Am 01.01.2017 um 18:25 schrieb ng0:
>>       url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
>
> I did not succeed downloading to checking out this url, but I could
> download this one:
>
> http://wiki.neo-layout.org/export/2476/linux/console/neo.map
>
>
> -- 
> Regards
> Hartmut Goebel
>
> | Hartmut Goebel          | h.goebel@crazy-compilers.com               |
> | www.crazy-compilers.com | compilers which you thought are impossible |
>
>
>

I made some changes, but neither "neo2" nor "neo" are recognized
by the console-keymap-service.
Maybe it needs to be compressed.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: Add neo-layout to kbd

[ng0]

ng0 <contact.ng0@cryptolab.net> writes:

> Hartmut Goebel <h.goebel@crazy-compilers.com> writes:
>
>> Am 01.01.2017 um 18:25 schrieb ng0:
>>>       url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
>>
>> I did not succeed downloading to checking out this url, but I could
>> download this one:
>>
>> http://wiki.neo-layout.org/export/2476/linux/console/neo.map
>>
>>
>> -- 
>> Regards
>> Hartmut Goebel
>>
>> | Hartmut Goebel          | h.goebel@crazy-compilers.com               |
>> | www.crazy-compilers.com | compilers which you thought are impossible |
>>
>>
>>
>
> I made some changes, but neither "neo2" nor "neo" are recognized
> by the console-keymap-service.
> Maybe it needs to be compressed.
> -- 
> ♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

And because I forgot to include the patches, and --subject-prefix
isn't a thing for git send-email, you can (and pull) see my
changes here:
https://pagure.io/guix-dev/commits/neo2layout

It's not ideal that I added a whole package for the .map file,
but I didn't really know how to fix the errors I got when I tried
to delete the "bin" folder with just an input.
Keeping it this way it'll be smaller to get once it is "build" by
hydra.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/