From unknown Wed Jun 18 22:54:06 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#25741 <25741@debbugs.gnu.org> To: bug#25741 <25741@debbugs.gnu.org> Subject: Status: neo layout for kbd Reply-To: bug#25741 <25741@debbugs.gnu.org> Date: Thu, 19 Jun 2025 05:54:06 +0000 retitle 25741 neo layout for kbd reassign 25741 guix-patches submitter 25741 ng0 severity 25741 normal tag 25741 moreinfo owner 25741 Ricardo Wurmus thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 11:44:42 2017 Received: (at submit) by debbugs.gnu.org; 15 Feb 2017 16:44:42 +0000 Received: from localhost ([127.0.0.1]:41255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2h8-0000lX-K6 for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:44:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2h7-0000lK-0i for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:44:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ce2h1-000440-6i for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:44:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47423) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ce2h1-00043v-3G for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:44:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ce2gz-0000jx-NC for guix-patches@gnu.org; Wed, 15 Feb 2017 11:44:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ce2gv-00042b-21 for guix-patches@gnu.org; Wed, 15 Feb 2017 11:44:33 -0500 Received: from perdizione.investici.org ([94.23.50.208]:63186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ce2gu-00042R-O0 for guix-patches@gnu.org; Wed, 15 Feb 2017 11:44:28 -0500 Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id 23272120FE7 for ; Wed, 15 Feb 2017 16:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1487177066; bh=bOjS8mTMEUsGjd4VrTnHr3fNQ9XK6aOmP4meCCwYV20=; h=Date:From:To:Subject; b=RcLM0xwoBvIQPXRkFOR/20GaLL6JfV9Mb7JcA2Q2BVmcz5VZBMV3OIfB2HtyybUid MxlTVM40Nwl3OiQ3Q8PgvMlBSSbO4qyAwROIMj20GlRIFd5c0IKMdTKHkG2TlZ1VaC jUs2jfnEgE8eiS70vk9wjqm3+v2OsZ5R0/lQzndk= Date: Wed, 15 Feb 2017 16:46:14 +0000 From: ng0 To: guix-patches@gnu.org Subject: neo layout for kbd Message-ID: <20170215164614.lmyymqkagvudqeq6@wasp> Mail-Followup-To: guix-patches@gnu.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) This adds two changes to the "kbd" package, to add the neo2 layout. I just configured a test system with it and it works. I'd prefer to find an smaller way to add the neo.map file, but this is functional for now. -- ng0 -- https://www.inventati.org/patternsinthechaos/ From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 11:46:31 2017 Received: (at 25741) by debbugs.gnu.org; 15 Feb 2017 16:46:31 +0000 Received: from localhost ([127.0.0.1]:41260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2it-0000p1-06 for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:46:31 -0500 Received: from aibo.runbox.com ([91.220.196.211]:32934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2ir-0000or-5y for 25741@debbugs.gnu.org; Wed, 15 Feb 2017 11:46:29 -0500 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1ce2ip-0002N6-Kj for 25741@debbugs.gnu.org; Wed, 15 Feb 2017 17:46:27 +0100 Received: from h-133-148.a2.corp.bahnhof.no ([37.123.133.148] helo=localhost) by mailfront11.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1ce2iZ-0002vR-Uk; Wed, 15 Feb 2017 17:46:12 +0100 From: contact.ng0@cryptolab.net To: 25741@debbugs.gnu.org Subject: [PATCH 2/2] gnu: kbd: Add neo layout. Date: Wed, 15 Feb 2017 16:48:00 +0000 Message-Id: <20170215164800.15907-2-contact.ng0@cryptolab.net> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170215164800.15907-1-contact.ng0@cryptolab.net> References: <20170215164800.15907-1-contact.ng0@cryptolab.net> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25741 Cc: ng0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) From: ng0 * gnu/packages/linux.scm (kbd): Add neo layout. [arguments]: Add new 'install-neo-layout' and 'add-neo-directory' phases. [native-inputs]: Add 'kbd-neo'. --- gnu/packages/linux.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 65221579b..45314eeb0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1658,6 +1658,12 @@ system.") (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'add-neo-directory + (lambda _ + (substitute* "data/Makefile.am" + (("mac/all") + "mac/all i386/neo")) + #t)) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (let ((gzip (assoc-ref %build-inputs "gzip")) @@ -1675,12 +1681,21 @@ system.") (for-each (lambda (prog) (wrap-program (string-append bin "/" prog) `("PATH" ":" prefix (,bin)))) - '("unicode_start" "unicode_stop")))))))) + '("unicode_start" "unicode_stop"))))) + (add-before 'install 'install-neo-layout + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((neo (assoc-ref %build-inputs "kbd-neo")) + (out (assoc-ref outputs "out")) + (neomap (string-append neo "/share/keymaps/i386/neo/neo.map")) + (keymaps (string-append out "/share/keymaps/i386/neo"))) + (mkdir-p keymaps) + (install-file neomap keymaps))))))) (inputs `(("check" ,check) ("gzip" ,gzip) ("bzip2" ,bzip2) ("pam" ,linux-pam))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("kbd-neo" ,kbd-neo))) (home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/") (synopsis "Linux keyboard utilities and keyboard maps") (description -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 15 11:46:41 2017 Received: (at 25741) by debbugs.gnu.org; 15 Feb 2017 16:46:41 +0000 Received: from localhost ([127.0.0.1]:41263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2iw-0000pH-7l for submit@debbugs.gnu.org; Wed, 15 Feb 2017 11:46:41 -0500 Received: from aibo.runbox.com ([91.220.196.211]:32942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ce2iu-0000p9-Fp for 25741@debbugs.gnu.org; Wed, 15 Feb 2017 11:46:33 -0500 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1ce2it-0002Nv-Ne for 25741@debbugs.gnu.org; Wed, 15 Feb 2017 17:46:31 +0100 Received: from h-133-148.a2.corp.bahnhof.no ([37.123.133.148] helo=localhost) by mailfront11.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1ce2iX-0002rt-H1; Wed, 15 Feb 2017 17:46:09 +0100 From: contact.ng0@cryptolab.net To: 25741@debbugs.gnu.org Subject: [PATCH 1/2] gnu: Add kbd-neo. Date: Wed, 15 Feb 2017 16:47:59 +0000 Message-Id: <20170215164800.15907-1-contact.ng0@cryptolab.net> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25741 Cc: ng0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) From: ng0 * gnu/packages/linux.scm (kbd-neo): New variable. --- gnu/packages/linux.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d53f5487b..65221579b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2016 Rene Saavedra -;;; Copyright © 2016 ng0 +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits @@ -90,6 +90,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) @@ -1592,6 +1593,45 @@ 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")) + (package + (name "kbd-neo") + (version (string-append "0.0.0-" revision "." + (number->string svn-revision))) + (source + (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 "-" version "-checkout")) + (sha256 + (base32 + "169hmlwcwz5sp605i8q5ikckxwsj1n3isylrnynflp30gbv9zrwn")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((out (string-append %output + "/share/keymaps/i386/neo")) + (source (assoc-ref %build-inputs "source"))) + (mkdir-p out) + (copy-file (string-append source "/neo.map") + (string-append out "/neo.map")))))) + (native-inputs + `(("source" ,source))) + (home-page "https://neo-layout.org") + (license license:gpl3) + (synopsis "Neo2 console font") + (description + "Neo2 console font intended to be installed with kbd.")))) + (define-public kbd (package (name "kbd") -- 2.11.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 02:08:11 2017 Received: (at 25741) by debbugs.gnu.org; 9 Mar 2017 07:08:11 +0000 Received: from localhost ([127.0.0.1]:47069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsBH-0000Lw-4j for submit@debbugs.gnu.org; Thu, 09 Mar 2017 02:08:11 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsBE-0000Ln-CA for 25741@debbugs.gnu.org; Thu, 09 Mar 2017 02:08:09 -0500 Received: from localhost (x4d0cd4e4.dyn.telefonica.de [77.12.212.228]) by mx.zohomail.com with SMTPS id 1489043280232153.80695877827623; Wed, 8 Mar 2017 23:08:00 -0800 (PST) References: <20170215164614.lmyymqkagvudqeq6@wasp> <20170215164800.15907-1-contact.ng0@cryptolab.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus To: contact.ng0@cryptolab.net Subject: Re: bug#25741: [PATCH 1/2] gnu: Add kbd-neo. In-reply-to: <20170215164800.15907-1-contact.ng0@cryptolab.net> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Thu, 09 Mar 2017 08:07:56 +0100 Message-ID: <874lz32aib.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 25741 Cc: ng0 , 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) contact.ng0@cryptolab.net writes: > From: ng0 > > * gnu/packages/linux.scm (kbd-neo): New variable. […] > +;; The Neo layout is a GPL3 licensed layout already present in Xorg, > +;; but not in kbd. home-page: https://neo-layout.org Please remove this comment. > +(define kbd-neo > + (let ((svn-revision 2476) > + (revision "1")) SVN revisions are monotonically increasing, so we don’t need the “revision” hack. > + (package > + (name "kbd-neo") > + (version (string-append "0.0.0-" revision "." > + (number->string svn-revision))) > + (source > + (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 "-" version "-checkout")) > + (sha256 > + (base32 > + "169hmlwcwz5sp605i8q5ikckxwsj1n3isylrnynflp30gbv9zrwn")))) Actually, you can get the neo.map file at the given revision 2476 with “url-fetch” from this URL: https://svn.neo-layout.org/!svn/bc/2476/linux/console/neo.map This would be better than to use the more complicated “svn-fetch”. > + (build-system trivial-build-system) > + (arguments > + `(#:modules ((guix build utils)) > + #:builder (begin > + (use-modules (guix build utils)) > + (let ((out (string-append %output > + "/share/keymaps/i386/neo")) > + (source (assoc-ref %build-inputs "source"))) > + (mkdir-p out) > + (copy-file (string-append source "/neo.map") > + (string-append out "/neo.map")))))) If you’re using the plain URL above this would be simplified a little. > + (native-inputs > + `(("source" ,source))) I don’t think this is needed > + (home-page "https://neo-layout.org") > + (license license:gpl3) Please move the license field below “description” for consistency. It is unfortunate that there are no license headers and that the license in the COPYING file is explicitly declared to apply to all files in the repository. > + (synopsis "Neo2 console font") This is not a font as far as I can see. > + (description > + "Neo2 console font intended to be installed with kbd.")))) > + Please use full sentences in the description. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 02:12:47 2017 Received: (at 25741) by debbugs.gnu.org; 9 Mar 2017 07:12:48 +0000 Received: from localhost ([127.0.0.1]:47073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsFj-0000S8-PA for submit@debbugs.gnu.org; Thu, 09 Mar 2017 02:12:47 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsFi-0000S1-Gp for 25741@debbugs.gnu.org; Thu, 09 Mar 2017 02:12:46 -0500 Received: from localhost (x4d0cd4e4.dyn.telefonica.de [77.12.212.228]) by mx.zohomail.com with SMTPS id 1489043559035995.1339698378594; Wed, 8 Mar 2017 23:12:39 -0800 (PST) References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus To: contact.ng0@cryptolab.net Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. In-reply-to: <20170215164800.15907-2-contact.ng0@cryptolab.net> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Thu, 09 Mar 2017 08:12:35 +0100 Message-ID: <8737em3ov0.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 25741 Cc: ng0 , 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) contact.ng0@cryptolab.net writes: > From: ng0 > > * gnu/packages/linux.scm (kbd): Add neo layout. > [arguments]: Add new 'install-neo-layout' and 'add-neo-directory' phases. > [native-inputs]: Add 'kbd-neo'. > --- I must say that this looks like a hack. Shouldn’t it be sufficient to install the gzipped map file to some directory? Why is it necessary to let kdb take care of installing the keymap? If it is just a matter of finding the desired keymap at runtime, I think it would be better to use a search path (if it exists). -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 02:15:04 2017 Received: (at control) by debbugs.gnu.org; 9 Mar 2017 07:15:04 +0000 Received: from localhost ([127.0.0.1]:47078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsHw-0000W0-4q for submit@debbugs.gnu.org; Thu, 09 Mar 2017 02:15:04 -0500 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clsHu-0000Vs-Pn for control@debbugs.gnu.org; Thu, 09 Mar 2017 02:15:03 -0500 Received: from localhost (x4d0cd4e4.dyn.telefonica.de [77.12.212.228]) by mx.zohomail.com with SMTPS id 1489043700689204.7477303276304; Wed, 8 Mar 2017 23:15:00 -0800 (PST) Date: Thu, 09 Mar 2017 08:14:58 +0100 To: control@debbugs.gnu.org From: Ricardo Wurmus Subject: control message for bug #25741 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: owner 25741 ! [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [135.84.80.216 listed in wl.mailspike.net] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.1 MISSING_MID Missing Message-Id: header X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: 1.0 (+) owner 25741 ! From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 05:53:22 2017 Received: (at 25741) by debbugs.gnu.org; 9 Mar 2017 10:53:22 +0000 Received: from localhost ([127.0.0.1]:47173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clvhB-0000iZ-O2 for submit@debbugs.gnu.org; Thu, 09 Mar 2017 05:53:21 -0500 Received: from latitanza.investici.org ([82.94.249.234]:32357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clvh9-0000iM-Bu for 25741@debbugs.gnu.org; Thu, 09 Mar 2017 05:53:20 -0500 Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id B59B912115F; Thu, 9 Mar 2017 10:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1489056798; bh=43uvCE6eqoNWU8nSanFjXeHV0M53WnZORKk5VDL8izg=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=t3t6rNAZatXOdLOsFe50OgwQZIEsl3WHiu5IiOml6bDsstG+DgdA6+/2bSNUDTW3P ikWhbmxxkEwjuQgCoEexfOoEGxM5kYkT+7Oxd8w71jtGZL8T3gfNPyH6Crt9j/cb+t lNXm06G47r5931obp4wXp8hbHnl4xrmDqcY9kl0k= Date: Thu, 9 Mar 2017 12:01:50 +0000 From: ng0 To: Ricardo Wurmus Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. Message-ID: <20170309120150.wwt2kwfktshlp6gy@abyayala> Mail-Followup-To: Ricardo Wurmus , 25741@debbugs.gnu.org, ng0 References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> <8737em3ov0.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8737em3ov0.fsf@elephly.net> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 25741 Cc: ng0 , 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Ricardo Wurmus transcribed 0.6K bytes: > > contact.ng0@cryptolab.net writes: > > > From: ng0 > > > > * gnu/packages/linux.scm (kbd): Add neo layout. > > [arguments]: Add new 'install-neo-layout' and 'add-neo-directory' phases. > > [native-inputs]: Add 'kbd-neo'. > > --- > > I must say that this looks like a hack. Shouldn’t it be sufficient to > install the gzipped map file to some directory? Why is it necessary to > let kdb take care of installing the keymap? > > If it is just a matter of finding the desired keymap at runtime, I think > it would be better to use a search path (if it exists). > > -- > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > https://elephly.net > I've looked at Nix, and I've looked at the Makefile of kbd. This is the way which works. I'm not sure if adding a searchpath would have the same effect, but once I have fixed the neo patch I can try it. Even if it's just to point out that it doesn't work this way. Thanks for your reviews, I'll send updated patches as soon as I have fixed my systems. From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 15:00:46 2017 Received: (at control) by debbugs.gnu.org; 14 Mar 2017 19:00:46 +0000 Received: from localhost ([127.0.0.1]:55964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnrgb-0002ED-Ps for submit@debbugs.gnu.org; Tue, 14 Mar 2017 15:00:46 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnrgY-0002Ag-IY for control@debbugs.gnu.org; Tue, 14 Mar 2017 15:00:44 -0400 Received: from localhost (x59cc89cc.dyn.telefonica.de [89.204.137.204]) by mx.zohomail.com with SMTPS id 1489518037269769.1754754732093; Tue, 14 Mar 2017 12:00:37 -0700 (PDT) Date: Tue, 14 Mar 2017 20:00:26 +0100 To: control@debbugs.gnu.org From: Ricardo Wurmus Subject: control message for bug #25741 X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" Message-Id: X-Spam-Score: -0.3 (/) tags 25741 moreinfo From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 27 17:53:46 2017 Received: (at 25741) by debbugs.gnu.org; 27 Apr 2017 21:53:46 +0000 Received: from localhost ([127.0.0.1]:43322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3rMA-0006Dt-Hs for submit@debbugs.gnu.org; Thu, 27 Apr 2017 17:53:46 -0400 Received: from latitanza.investici.org ([82.94.249.234]:59606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3rM8-0006Dj-Nu for 25741@debbugs.gnu.org; Thu, 27 Apr 2017 17:53:45 -0400 Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id 5C72D120CB4; Thu, 27 Apr 2017 21:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1493330023; bh=muXrbgnqztvjGaa170NL2qPvbM5yssm2BUECr4zcCOc=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=AdiGuUlTF8xloF2ZwPAKIGgKpKxR27hqtbjEG14Frvf8hatJW61OZxKp/mk5crslS 5i5qRO1M/DTlseqv2lMDDLBaAD+95DjY4MzdXYkyMfJRPDz7vIv+oOXBibZhMAaW7J uPVw647UvlpHz+OIHwdMb6FFvk6lvL6DqcZCZ8gs= Date: Thu, 27 Apr 2017 21:53:37 +0000 From: ng0 To: Ricardo Wurmus Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. Message-ID: <20170427215337.smsuh3jkuq7gw2ua@abyayala> Mail-Followup-To: Ricardo Wurmus , 25741@debbugs.gnu.org References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> <8737em3ov0.fsf@elephly.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="w6es72wzlhrooxkh" Content-Disposition: inline In-Reply-To: <8737em3ov0.fsf@elephly.net> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 25741 Cc: contact.ng0@cryptolab.net, 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --w6es72wzlhrooxkh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Alright, here is the reworked version. Because it is equal to the result of the previous one, I am positive that it works like this (the previous version did). -- PGP and more: https://people.pragmatique.xyz/ng0/ --w6es72wzlhrooxkh Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-kbd-Add-neo-layout.patch" Content-Transfer-Encoding: quoted-printable =46rom 0377688c2db24ca87979f362433434bafd737040 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sun, 1 Jan 2017 16:36:27 +0000 Subject: [PATCH] gnu: kbd: Add neo layout. * gnu/packages/linux.scm (kbd): Add neo layout. [arguments]: Add new 'install-neo-layout' and 'add-neo-directory' phases. [native-inputs]: Add 'kbd-neo'. --- gnu/packages/linux.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b299f9e5..b2a552718 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1674,6 +1674,12 @@ system.") (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'add-neo-directory + (lambda _ + (substitute* "data/Makefile.am" + (("mac/all") + "mac/all i386/neo")) + #t)) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (let ((gzip (assoc-ref %build-inputs "gzip")) @@ -1691,12 +1697,33 @@ system.") (for-each (lambda (prog) (wrap-program (string-append bin "/" prog) `("PATH" ":" prefix (,bin)))) - '("unicode_start" "unicode_stop")))))))) + '("unicode_start" "unicode_stop"))))) + (add-before 'install 'install-neo-layout + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((neo (assoc-ref %build-inputs "kbd-neo")) + (out (assoc-ref outputs "out")) + (neo-keymaps (string-append out "/share/keymaps/i386/n= eo"))) + (mkdir-p neo-keymaps) + (install-file neo neo-keymaps) + ;; Rename the file as it includes a hash in the filename. + (for-each (lambda (file) + (rename-file file (string-append neo-keymaps "/= neo.map"))) + (find-files (string-append out "/share/keymaps") + "neo\\.map$")) + #t)))))) (inputs `(("check" ,check) ("gzip" ,gzip) ("bzip2" ,bzip2) ("pam" ,linux-pam))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("kbd-neo" + ,(origin + (method url-fetch) + (uri (string-append "https://svn.neo-layout.org/!= svn/bc/" + "2476/linux/console/neo.map")) + (sha256 + (base32 + "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1= vf0r4g")))))) (home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/") (synopsis "Linux keyboard utilities and keyboard maps") (description --=20 2.12.2 --w6es72wzlhrooxkh-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 04:02:47 2017 Received: (at 25741) by debbugs.gnu.org; 28 Apr 2017 08:02:47 +0000 Received: from localhost ([127.0.0.1]:43543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d40rX-00040z-1s for submit@debbugs.gnu.org; Fri, 28 Apr 2017 04:02:47 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21095) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d40rU-00040q-QI for 25741@debbugs.gnu.org; Fri, 28 Apr 2017 04:02:45 -0400 Received: from localhost (141.80.245.240 [141.80.245.240]) by mx.zohomail.com with SMTPS id 1493366562117653.1967691360813; Fri, 28 Apr 2017 01:02:42 -0700 (PDT) References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> <8737em3ov0.fsf@elephly.net> <20170427215337.smsuh3jkuq7gw2ua@abyayala> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus To: ng0 Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. In-reply-to: <20170427215337.smsuh3jkuq7gw2ua@abyayala> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Fri, 28 Apr 2017 10:02:39 +0200 Message-ID: <87d1bxarj4.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 25741 Cc: 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) ng0 writes: > Alright, here is the reworked version. > > Because it is equal to the result of the previous one, I am > positive that it works like this (the previous version did). Thanks. This still modifies the kbd package. Have you tried what I proposed, namely to install this as a separate package and /somehow/ make kbd find the installed keymap? It would be nicer than to modify the kbd package itself. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 05:39:47 2017 Received: (at 25741) by debbugs.gnu.org; 28 Apr 2017 09:39:47 +0000 Received: from localhost ([127.0.0.1]:43618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d42NP-0006MF-Ew for submit@debbugs.gnu.org; Fri, 28 Apr 2017 05:39:47 -0400 Received: from fragranza.investici.org ([178.175.144.26]:43382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d42NM-0006M5-Fu for 25741@debbugs.gnu.org; Fri, 28 Apr 2017 05:39:45 -0400 Received: from [178.175.144.26] (fragranza [178.175.144.26]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id 8AF442C012F; Fri, 28 Apr 2017 09:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1493372382; bh=lA8zJ+/YoL5q9cHUZUe25xVwsqsbBA0y7CUEGm9U5+w=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=lvYuHykzuBy1s2RG72GsprQgiXMaVsywYsWQ3L/chNeuTpwjkvRtIt6zqb1R2lW4Y vd9FeG0fiLCXHM7y3Ww8Nr6eilp9Osr9EB7WEkMLjzczOLY21sWsFAPI/qYsO0AXM2 uFy2O8yCeDO59xI8+j8YONG6NwUqi3A62S/rma+c= Date: Fri, 28 Apr 2017 09:39:40 +0000 From: ng0 To: Ricardo Wurmus Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. Message-ID: <20170428093940.qebl5oexqszdblw3@abyayala> Mail-Followup-To: Ricardo Wurmus , 25741@debbugs.gnu.org References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> <8737em3ov0.fsf@elephly.net> <20170427215337.smsuh3jkuq7gw2ua@abyayala> <87d1bxarj4.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87d1bxarj4.fsf@elephly.net> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 25741 Cc: ng0 , 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Ricardo Wurmus transcribed 0.5K bytes: > > ng0 writes: > > > Alright, here is the reworked version. > > > > Because it is equal to the result of the previous one, I am > > positive that it works like this (the previous version did). > > Thanks. This still modifies the kbd package. Have you tried what I > proposed, namely to install this as a separate package and /somehow/ > make kbd find the installed keymap? It would be nicer than to modify > the kbd package itself. > > -- > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > https://elephly.net > Would this still work as intended? kbd is a global package, part of the base. If I create a new package which inherits from kbd, and people have to explicitly add it to (packages) in (operating-system), it will colide with (kbd). I think this really is the safest solution unless you can convince me that it will work the way you proposed. Or am I wrong and all you suggest is that (kbd) simply finds the neo.map in the store? I feel like kbd doesn#t work this way, but depending on your explanation I can try. -- PGP and more: https://people.pragmatique.xyz/ng0/ From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 10:37:59 2017 Received: (at 25741) by debbugs.gnu.org; 28 Apr 2017 14:38:00 +0000 Received: from localhost ([127.0.0.1]:44836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d471z-0007Qh-NS for submit@debbugs.gnu.org; Fri, 28 Apr 2017 10:37:59 -0400 Received: from sender-of-o51.zoho.com ([135.84.80.216]:21139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d471x-0007QZ-Dy for 25741@debbugs.gnu.org; Fri, 28 Apr 2017 10:37:57 -0400 Received: from localhost (port-92-200-17-209.dynamic.qsc.de [92.200.17.209]) by mx.zohomail.com with SMTPS id 1493390274936823.9399796742642; Fri, 28 Apr 2017 07:37:54 -0700 (PDT) References: <20170215164800.15907-1-contact.ng0@cryptolab.net> <20170215164800.15907-2-contact.ng0@cryptolab.net> <8737em3ov0.fsf@elephly.net> <20170427215337.smsuh3jkuq7gw2ua@abyayala> <87d1bxarj4.fsf@elephly.net> <20170428093940.qebl5oexqszdblw3@abyayala> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Ricardo Wurmus To: ng0 Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. In-reply-to: <20170428093940.qebl5oexqszdblw3@abyayala> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Fri, 28 Apr 2017 16:37:52 +0200 Message-ID: <87bmrgy4vz.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: 25741 Cc: 25741@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) ng0 writes: > Would this still work as intended? > kbd is a global package, part of the base. This doesn’t matter. The question here is: does this piece of software have a mechanism to override or augment the search path for keymaps. Often this is done with environment variables. So I took the sources and searched for “getenv”: tar xf $(guix build kbd) grep getenv -r kbd-* Here’s what turned up: […] kbd-2.0.4/src/libkeymap/analyze.l: if ((ev = getenv("LOADKEYS_INCLUDE_PATH")) != NULL) { kbd-2.0.4/src/libkeymap/analyze.c: if ((ev = getenv("LOADKEYS_INCLUDE_PATH")) != NULL) { kbd-2.0.4/src/loadkeys.c: if ((ev = getenv("LOADKEYS_KEYMAP_PATH")) != NULL) { […] This might be useful. > If I create a new > package which inherits from kbd, and people have to explicitly > add it to (packages) in (operating-system), it will colide with > (kbd). I don’t understand what you mean. Guix gives us programmatic control over the package graph. It is easy to replace all instances of one package with another package (see “package-input-rewriting”). In this case that’s not even necessary; one can just take the “%base-packages” list, delete “kbd” from it, and cons “my-custom-kbd” onto it. However, none of this will be needed if you can augment the path where kbd looks for keymaps. > I feel like kbd doesn#t work this way What makes you say this? I don’t see anything special about kbd, but maybe I’m missing something here. -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net From debbugs-submit-bounces@debbugs.gnu.org Thu May 25 12:47:57 2017 Received: (at 25741) by debbugs.gnu.org; 25 May 2017 16:47:57 +0000 Received: from localhost ([127.0.0.1]:37921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDvvY-0006B6-Rx for submit@debbugs.gnu.org; Thu, 25 May 2017 12:47:56 -0400 Received: from aibo.runbox.com ([91.220.196.211]:45110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDvvX-0006Aw-14 for 25741@debbugs.gnu.org; Thu, 25 May 2017 12:47:55 -0400 Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dDvvU-0004Nv-TH for 25741@debbugs.gnu.org; Thu, 25 May 2017 18:47:53 +0200 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1dDvvU-0005MJ-Rm for 25741@debbugs.gnu.org; Thu, 25 May 2017 18:47:52 +0200 MIME-Version: 1.0 Received: from [Authenticated user (892961)] by runbox.com with http (RMM6); for <25741@debbugs.gnu.org>; Thu, 25 May 2017 16:47:52 GMT From: To: "25741" <25741@debbugs.gnu.org> Subject: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. Date: Thu, 25 May 2017 18:47:52 +0200 (CEST) X-Mailer: RMM6 Content-Type: multipart/mixed; boundary="----------=_1495730872-18135-7" Message-Id: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25741 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) This is a multi-part message in MIME format... ------------=_1495730872-18135-7 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I updated with the changes you suggested and reconfigured my system with th= e patches applied. Executing on tty1 as privileged user, "loadkeys neo" works and does what it= should do. Is it good to go now?= ------------=_1495730872-18135-7 Content-Type: application/octet-stream; name="=?UTF-8?Q?0001-gnu-kbd-Add-native-search-paths.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?0001-gnu-kbd-Add-native-search-paths.patch?=" Content-Transfer-Encoding: base64 RnJvbSAwODE4YWM5MmVmNDQwMDEzZjVmMTAxM2EwZmNmY2YyZWJkNzAwNGUy IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBuZzAgPG5nMEBuby1y ZXBseS5wcmFnbWF0aXF1ZS54eXo+CkRhdGU6IFRodSwgMjUgTWF5IDIwMTcg MTI6NDg6MTYgKzAwMDAKU3ViamVjdDogW1BBVENIIDEvMl0gZ251OiBrYmQ6 IEFkZCAnbmF0aXZlLXNlYXJjaC1wYXRocycuCgoqIGdudS9wYWNrYWdlcy9s aW51eC5zY20gKGtiZClbbmF0aXZlLXNlYXJjaC1wYXRoc106IEFkZCBpdC4K LS0tCiBnbnUvcGFja2FnZXMvbGludXguc2NtIHwgNiArKysrKy0KIDEgZmls ZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRp ZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvbGludXguc2NtIGIvZ251L3BhY2th Z2VzL2xpbnV4LnNjbQppbmRleCAyOGJhYmI0ZGIuLjA0MDY2ZDgwMCAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL2xpbnV4LnNjbQorKysgYi9nbnUvcGFj a2FnZXMvbGludXguc2NtCkBAIC0xOCw3ICsxOCw3IEBACiA7OzsgQ29weXJp Z2h0IMKpIDIwMTYsIDIwMTcgTWFyaXVzIEJha2tlIDxtYmFra2VAZmFzdG1h aWwuY29tPgogOzs7IENvcHlyaWdodCDCqSAyMDE2IFJlbmUgU2FhdmVkcmEg PHJlbm5lc0BvcGVubWFpbGJveC5vcmc+CiA7OzsgQ29weXJpZ2h0IMKpIDIw MTYgQ2FybG9zIFPDoW5jaGV6IGRlIExhIExhbWEgPGNzYW5jaGV6ZGxsQGdt YWlsLmNvbT4KLTs7OyBDb3B5cmlnaHQgwqkgMjAxNiBuZzAgPG5nMEBsaWJl cnRhZC5wdz4KKzs7OyBDb3B5cmlnaHQgwqkgMjAxNiwgMjAxNyBuZzAgPG5n MEBuby1yZXBseS5wcmFnbWF0aXF1ZS54eXo+CiA7OzsgQ29weXJpZ2h0IMKp IDIwMTcgTGVvIEZhbXVsYXJpIDxsZW9AZmFtdWxhcmkubmFtZT4KIDs7OyBD b3B5cmlnaHQgwqkgMjAxNyBKb3PDqSBNaWd1ZWwgU8OhbmNoZXogR2FyY8Ot YSA8am1pMmtAb3Blbm1haWxib3guY29tPgogOzs7IENvcHlyaWdodCDCqSAy MDE3IEfDoWJvciBCb3Nrb3ZpdHMgPGJvc2tvdml0c0BnbWFpbC5jb20+CkBA IC0xNjg5LDYgKzE2ODksMTAgQEAgc3lzdGVtLiIpCiAgICAgICAgICAgICAg ICgiZ3ppcCIgLGd6aXApCiAgICAgICAgICAgICAgICgiYnppcDIiICxiemlw MikKICAgICAgICAgICAgICAgKCJwYW0iICxsaW51eC1wYW0pKSkKKyAgICAo bmF0aXZlLXNlYXJjaC1wYXRocworICAgICAobGlzdCAoc2VhcmNoLXBhdGgt c3BlY2lmaWNhdGlvbgorICAgICAgICAgICAgKHZhcmlhYmxlICJMT0FES0VZ U19LRVlNQVBfUEFUSCIpCisgICAgICAgICAgICAoZmlsZXMgKGxpc3QgInNo YXJlL2tleW1hcHMiKSkpKSkKICAgICAobmF0aXZlLWlucHV0cyBgKCgicGtn LWNvbmZpZyIgLHBrZy1jb25maWcpKSkKICAgICAoaG9tZS1wYWdlICJodHRw Oi8va2JkLXByb2plY3Qub3JnLyIpCiAgICAgKHN5bm9wc2lzICJMaW51eCBr ZXlib2FyZCB1dGlsaXRpZXMgYW5kIGtleWJvYXJkIG1hcHMiKQotLSAKMi4x My4wCgo= ------------=_1495730872-18135-7 Content-Type: application/octet-stream; name="=?UTF-8?Q?0002-gnu-Add-kbd-neo.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?0002-gnu-Add-kbd-neo.patch?=" Content-Transfer-Encoding: base64 RnJvbSA0MWE1MzlhY2ZiZmU3ZWJiMzBjMDdkNTg1ZDlmMWQ4NzRhM2ViZmU5 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBuZzAgPG5nMEBsaWJl cnRhZC5wdz4KRGF0ZTogU3VuLCAxIEphbiAyMDE3IDE2OjM2OjI3ICswMDAw ClN1YmplY3Q6IFtQQVRDSCAyLzJdIGdudTogQWRkIGtiZC1uZW8uCgoqIGdu dS9wYWNrYWdlcy9saW51eC5zY20gKGtiZC1uZW8pOiBOZXcgdmFyaWFibGUu Ci0tLQogZ251L3BhY2thZ2VzL2xpbnV4LnNjbSB8IDMyICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMzIgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9saW51eC5z Y20gYi9nbnUvcGFja2FnZXMvbGludXguc2NtCmluZGV4IDA0MDY2ZDgwMC4u MWI2ZGQ1NDExIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvbGludXguc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9saW51eC5zY20KQEAgLTE2NDEsNiArMTY0 MSwzNyBAQCBzeXN0ZW0uIikKICAgICAobGljZW5zZSAobGlzdCBsaWNlbnNl OmdwbDIgICAgICAgICAgICAgICAgICAgO3Byb2dyYW1zCiAgICAgICAgICAg ICAgICAgICAgbGljZW5zZTpsZ3BsMi4xKSkpKSAgICAgICAgICAgIDtsaWJy YXJ5CiAKKyhkZWZpbmUtcHVibGljIGtiZC1uZW8KKyAgKHBhY2thZ2UKKyAg ICAobmFtZSAia2JkLW5lbyIpCisgICAgKHZlcnNpb24gIjI0ODYiKQorICAg IChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAgIChtZXRob2QgdXJsLWZl dGNoKQorICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vc3Zu Lm5lby1sYXlvdXQub3JnLyFzdm4vYmMvIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgdmVyc2lvbiAiL2xpbnV4L2NvbnNvbGUvbmVvLm1hcCIpKQor ICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAiLSIgdmVy c2lvbiAiLm1hcCIpKQorICAgICAgIChzaGEyNTYKKyAgICAgICAgKGJhc2Uz MgorICAgICAgICAgIjE5bWZyZDMxdnpwc2ppd2M3cHNoeG0wYjBzejVkZDE3 eHJ6NmswNzljeTRpbTF2ZjByNGciKSkpKQorICAgIChidWlsZC1zeXN0ZW0g dHJpdmlhbC1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cworICAgICBg KCM6bW9kdWxlcyAoKGd1aXggYnVpbGQgdXRpbHMpKQorICAgICAgICM6YnVp bGRlciAoYmVnaW4KKyAgICAgICAgICAgICAgICAgICAodXNlLW1vZHVsZXMg KGd1aXggYnVpbGQgdXRpbHMpKQorICAgICAgICAgICAgICAgICAgIChsZXQg KChvdXQgKHN0cmluZy1hcHBlbmQgJW91dHB1dCAiL3NoYXJlL2tleW1hcHMi KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAoc291cmNlIChhc3NvYy1y ZWYgJWJ1aWxkLWlucHV0cyAic291cmNlIikpKQorICAgICAgICAgICAgICAg ICAgICAgKG1rZGlyLXAgb3V0KQorICAgICAgICAgICAgICAgICAgICAgKGNv cHktZmlsZSBzb3VyY2UgKHN0cmluZy1hcHBlbmQgb3V0ICIvbmVvLm1hcCIp KSkpKSkKKyAgICAoaG9tZS1wYWdlICJodHRwczovL25lby1sYXlvdXQub3Jn IikKKyAgICAoc3lub3BzaXMgIk5lbzIgY29uc29sZSBsYXlvdXQgZm9yIGxv YWRrZXlzKDEpIikKKyAgICAoZGVzY3JpcHRpb24KKyAgICAgIktiZC1uZW8g cHJvdmlkZXMgdGhlIE5lbzIga2V5Ym9hcmQgbGF5b3V0IGZvciB1c2Ugd2l0 aCBsb2Fka2V5cygxKQord2l0aCBrYmQoNCkuIikKKyAgICA7OyBUaGUgZmls ZSBpcyBsb2NhdGVkIGluIGFuIHN2biBkaXJlY3RvcnksIHRoZSBlbnRpcmUg Y29udGVudCBvZgorICAgIDs7IHRoZSBkaXJlY3RvcnkgaXMgbGljZW5zZWQg YXMgR1BMMy4KKyAgICAobGljZW5zZSBsaWNlbnNlOmdwbDMpKSkKKwogKGRl ZmluZS1wdWJsaWMga2JkCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImtiZCIp CkBAIC0xNjg5LDYgKzE3MjAsNyBAQCBzeXN0ZW0uIikKICAgICAgICAgICAg ICAgKCJnemlwIiAsZ3ppcCkKICAgICAgICAgICAgICAgKCJiemlwMiIgLGJ6 aXAyKQogICAgICAgICAgICAgICAoInBhbSIgLGxpbnV4LXBhbSkpKQorCiAg ICAgKG5hdGl2ZS1zZWFyY2gtcGF0aHMKICAgICAgKGxpc3QgKHNlYXJjaC1w YXRoLXNwZWNpZmljYXRpb24KICAgICAgICAgICAgICh2YXJpYWJsZSAiTE9B REtFWVNfS0VZTUFQX1BBVEgiKQotLSAKMi4xMy4wCgo= ------------=_1495730872-18135-7-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 25 14:17:36 2017 Received: (at 25741-done) by debbugs.gnu.org; 25 May 2017 18:17:36 +0000 Received: from localhost ([127.0.0.1]:38036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDxKK-0008Ig-7R for submit@debbugs.gnu.org; Thu, 25 May 2017 14:17:36 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDxKH-0008IU-FM for 25741-done@debbugs.gnu.org; Thu, 25 May 2017 14:17:34 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CAACF208E2; Thu, 25 May 2017 14:17:32 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 25 May 2017 14:17:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=6pNYP0meipz10jSk17dN62X1agvfjtVnB11IOv4eS 2I=; b=2ius6lDZweG/42yJUI9fm3lhYLPJ+WqzldSJtq7EpxU+IA9odMVcIlrQ2 Wb5Nh+GR7D6P6rUhoqt+wFUKlR3bs/K89UDBlbggqd07QDcvNHjR0xsYtX9a+6eT iXrWcE+6inzdB9e1Fts9ts6AMvKso/UsOAjmWXAtmhd5Fv6RwFCPJKlVVW/++R0m V5oIinPc7XxmU/kPfD/k8WUoAV/ikn84uOI/uZny/VuNhZRDQnsSOaMYuvc3cmG2 68peCeFGff1aIkSiidJvK91yqgoIr18L8JWIquORbhpcA4jvQ8BrqNqLlvPnnkDf F9A2n8td29vqrd1U95QstnnLT1ZkA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=6pNYP0meipz10jSk17 dN62X1agvfjtVnB11IOv4eS2I=; b=eM7bLmYZcmbyf2byzrZZNjdCdcfCO373f7 GZ56dKrOeAzp7v7UD+0fLFTW0xOHBM31tcOQusiV/Xg/Saas36uSP+o2Jghhi9rZ Hu5O27pR8rl0M4caM1EXj6mt3vp6GFLqozbDMIZLHyWiNs5RlbPtXj767szIQlvG TjTmP0V6kOlTezxef+q70P3N40D/S2DClpUwKdVfzB7HHI8yVNh8riKPkCkg9r2B dMyKGSveoK2D4caZgcN6pYthCjrmaf28TYBxCIl5YhgeNSaDe7b9RcyW+vZAPvbW mFAXx5Z45Qk7I7R9oYT19yQN31SVRX4ForN+chyjABVPA9MvFVQg== X-ME-Sender: X-Sasl-enc: dK3eqQDo0V2zLosZ7LNqzw5M4cRhNckWuISArZg6LH26 1495736252 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 691A57E8C1; Thu, 25 May 2017 14:17:32 -0400 (EDT) From: Marius Bakke To: ng0@pragmatique.xyz, 25741 <25741-done@debbugs.gnu.org> Subject: Re: bug#25741: [PATCH 2/2] gnu: kbd: Add neo layout. In-Reply-To: References: <20170215164614.lmyymqkagvudqeq6@wasp> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) 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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 25741-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= 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----- --=-=-=-- From unknown Wed Jun 18 22:54:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 23 Jun 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator