[PATCH 0/2] gnu: kbd: Update to 2.0.3.

[PATCH 0/2] gnu: kbd: Update to 2.0.3.

[Alex Kost]

As reported by quiliro on #guix, currently "loadkeys dvorak-es"
errors giving:

    cannot open include file euro

Updating 'kbd' package to the latest version fixes this problem.

I suppose it's ok to commit it to master, right?

For the records, the fix was simple:
https://git.kernel.org/cgit/linux/kernel/git/legion/kbd.git/commit/data/keymaps?id=6fa56d7594aca7e936523282871e87463560aff4

[PATCH 1/2] gnu: kbd: Use 'modify-phases'.
[PATCH 2/2] gnu: kbd: Update to 2.0.3.

[PATCH 1/2] gnu: kbd: Use 'modify-phases'.

[Alex Kost]

* gnu/packages/linux.scm (kbd)[arguments]: Use 'modify-phases'.
---
 gnu/packages/linux.scm | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3a4c9f1..f17e0b4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1486,27 +1486,26 @@ system.")
                      "tty"))))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (alist-cons-before
-                 'build 'pre-build
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (let ((gzip  (assoc-ref %build-inputs "gzip"))
-                         (bzip2 (assoc-ref %build-inputs "bzip2")))
-                     (substitute* "src/libkeymap/findfile.c"
-                       (("gzip")
-                        (string-append gzip "/bin/gzip"))
-                       (("bzip2")
-                        (string-append bzip2 "/bin/bzip2")))))
-                 (alist-cons-after
-                  'install 'post-install
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    ;; Make sure these programs find their comrades.
-                    (let* ((out (assoc-ref outputs "out"))
-                           (bin (string-append out "/bin")))
-                      (for-each (lambda (prog)
-                                  (wrap-program (string-append bin "/" prog)
-                                                `("PATH" ":" prefix (,bin))))
-                                '("unicode_start" "unicode_stop"))))
-                  %standard-phases))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'pre-build
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((gzip  (assoc-ref %build-inputs "gzip"))
+                   (bzip2 (assoc-ref %build-inputs "bzip2")))
+               (substitute* "src/libkeymap/findfile.c"
+                 (("gzip")
+                  (string-append gzip "/bin/gzip"))
+                 (("bzip2")
+                  (string-append bzip2 "/bin/bzip2"))))))
+         (add-after 'install 'post-install
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Make sure these programs find their comrades.
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin")))
+               (for-each (lambda (prog)
+                           (wrap-program (string-append bin "/" prog)
+                             `("PATH" ":" prefix (,bin))))
+                         '("unicode_start" "unicode_stop"))))))))
     (inputs `(("check" ,check)
               ("gzip" ,gzip)
               ("bzip2" ,bzip2)
-- 
2.7.3

[PATCH 2/2] gnu: kbd: Update to 2.0.3.

[Alex Kost]

* gnu/packages/linux.scm (kbd): Update to 2.0.3.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f17e0b4..97798ab 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1465,14 +1465,14 @@ system.")
 (define-public kbd
   (package
     (name "kbd")
-    (version "2.0.2")
+    (version "2.0.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/utils/kbd/kbd-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "04mrms12nm5sas0nxs94yrr3hz7gmqhnmfgb9ff34bh1jszxmzcx"))
+                "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.7.3

Re: [PATCH 0/2] gnu: kbd: Update to 2.0.3.

[Leo Famulari]

On Fri, Apr 08, 2016 at 10:09:34PM +0300, Alex Kost wrote:
> As reported by quiliro on #guix, currently "loadkeys dvorak-es"
> errors giving:
> 
>     cannot open include file euro
> 
> Updating 'kbd' package to the latest version fixes this problem.
> 
> I suppose it's ok to commit it to master, right?

Looks straightforward!

> 
> For the records, the fix was simple:
> https://git.kernel.org/cgit/linux/kernel/git/legion/kbd.git/commit/data/keymaps?id=6fa56d7594aca7e936523282871e87463560aff4
> 
> [PATCH 1/2] gnu: kbd: Use 'modify-phases'.
> [PATCH 2/2] gnu: kbd: Update to 2.0.3.
>