* Add neo-layout to kbd
@ 2017-01-01 17:22 ng0
2017-01-01 17:22 ` [PATCH 1/2] gnu: Add kbd-neo ng0
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: ng0 @ 2017-01-01 17:22 UTC (permalink / raw)
To: guix-devel
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.
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] gnu: Add kbd-neo.
2017-01-01 17:22 Add neo-layout to kbd ng0
@ 2017-01-01 17:22 ` ng0
2017-01-01 19:25 ` Hartmut Goebel
2017-01-01 17:22 ` [PATCH 2/2] gnu: kbd: Add neo layout ng0
2017-01-01 17:25 ` Add neo-layout to kbd ng0
2 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2017-01-01 17:22 UTC (permalink / raw)
To: guix-devel
* 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/2] gnu: kbd: Add neo layout.
2017-01-01 17:22 Add neo-layout to kbd ng0
2017-01-01 17:22 ` [PATCH 1/2] gnu: Add kbd-neo ng0
@ 2017-01-01 17:22 ` ng0
2017-01-01 19:15 ` Hartmut Goebel
2017-01-01 17:25 ` Add neo-layout to kbd ng0
2 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2017-01-01 17:22 UTC (permalink / raw)
To: guix-devel
* 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: Add neo-layout to kbd
2017-01-01 17:22 Add neo-layout to kbd ng0
2017-01-01 17:22 ` [PATCH 1/2] gnu: Add kbd-neo ng0
2017-01-01 17:22 ` [PATCH 2/2] gnu: kbd: Add neo layout ng0
@ 2017-01-01 17:25 ` ng0
2017-01-01 19:34 ` Hartmut Goebel
2 siblings, 1 reply; 9+ messages in thread
From: ng0 @ 2017-01-01 17:25 UTC (permalink / raw)
To: guix-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-01-22 10:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-01 17:22 Add neo-layout to kbd ng0
2017-01-01 17:22 ` [PATCH 1/2] gnu: Add kbd-neo ng0
2017-01-01 19:25 ` Hartmut Goebel
2017-01-01 17:22 ` [PATCH 2/2] gnu: kbd: Add neo layout ng0
2017-01-01 19:15 ` Hartmut Goebel
2017-01-01 17:25 ` Add neo-layout to kbd ng0
2017-01-01 19:34 ` Hartmut Goebel
2017-01-22 1:53 ` ng0
2017-01-22 10:36 ` ng0
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).