From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDxKo-0000Vq-VA for guix-patches@gnu.org; Thu, 25 May 2017 14:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDxKl-00007a-Pp for guix-patches@gnu.org; Thu, 25 May 2017 14:18:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35362) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDxKl-00007O-Eg for guix-patches@gnu.org; Thu, 25 May 2017 14:18:03 -0400 Subject: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. Resent-To: guix-patches@gnu.org, Ricardo Wurmus Resent-Message-ID: From: Marius Bakke In-Reply-To: References: <20170215164614.lmyymqkagvudqeq6@wasp> Date: Thu, 25 May 2017 20:17:30 +0200 Message-ID: <87tw48vm11.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ng0@pragmatique.xyz, 25741 <25741-done@debbugs.gnu.org> --=-=-= Content-Type: text/plain ng0@pragmatique.xyz writes: > 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? LGTM. I pushed this with a few minor changes: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed1c6846b..2e984dd42 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1662,15 +1662,16 @@ system.") (let ((out (string-append %output "/share/keymaps")) (source (assoc-ref %build-inputs "source"))) (mkdir-p out) - (copy-file source (string-append out "/neo.map")))))) + (copy-file source (string-append out "/neo.map")) + #t)))) (home-page "https://neo-layout.org") - (synopsis "Neo2 console layout for loadkeys(1)") + (synopsis "Neo2 console layout") (description - "Kbd-neo provides the Neo2 keyboard layout for use with loadkeys(1) -with kbd(4).") + "Kbd-neo provides the Neo2 keyboard layout for use with +@command{loadkeys(1)} from @code{kbd(4)}.") ;; The file is located in an svn directory, the entire content of ;; the directory is licensed as GPL3. - (license license:gpl3))) + (license license:gpl3+))) --8<---------------cut here---------------end--------------->8--- --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlknH7oACgkQoqBt8qM6 VPp4Zwf+NjvuGhtcFlgMCS6dXOqQ8ymWejdDJo4sWsrbpr6clV8nYRXX8gTMN0dM +No2W7Ivkcmk4bbHopXJVZWyptxmt8v+79mMJB8DhntkVhPDUo9KOWG+m8iW7oIT +wwZf/0CAfU7k5wwsdivKibzZ4PSg6ZXZVimUWV9J1JLXeZtp6nT1oif03XyxoTh OMXIXx3ByvMUW3cJnJqA5bYyCY051PiviU+cCyj4IuOeorgGj206NHKpFS7dWQrz ZekijO/M7n5sFbBksmLsI6LWzmgPPum+JOtkKU6uT+FZ/cgXb6trBp7QE1NrYKMf VoF+66VCEEDjCQaP7/zBK183QiMNNA== =6eT8 -----END PGP SIGNATURE----- --=-=-=--