From unknown Sat Jun 21 03:22:31 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#67534 <67534@debbugs.gnu.org> To: bug#67534 <67534@debbugs.gnu.org> Subject: Status: [PATCH] gnu: qmk: Support custom keyboards. Reply-To: bug#67534 <67534@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:22:31 +0000 retitle 67534 [PATCH] gnu: qmk: Support custom keyboards. reassign 67534 guix-patches submitter 67534 Sergey Trofimov severity 67534 normal tag 67534 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 29 15:32:54 2023 Received: (at submit) by debbugs.gnu.org; 29 Nov 2023 20:32:54 +0000 Received: from localhost ([127.0.0.1]:51545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8REr-0007ez-Sa for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:32:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8REq-0007em-PX for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:32:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8REd-0005cS-9q for guix-patches@gnu.org; Wed, 29 Nov 2023 15:32:39 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8REb-0002oB-0z for guix-patches@gnu.org; Wed, 29 Nov 2023 15:32:39 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a08e4352992so25227366b.1 for ; Wed, 29 Nov 2023 12:32:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1701289952; x=1701894752; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LTr7aZeHAuvEWNDeV8yoPp2AIeoMYxrruS87Jbs1XAk=; b=YiyoriyNTd6pzB6JC4jjJAMOsHT+AN5cTs5P6m9NKmZx8o2fdAjodKqxYTwox/ZADd 49OOOpB8F20fJgwS/enbiFeBE/IuEz54iuuyuyknUjZJg+ytFFdPHMITdbMZrw1IwmAA UO2WiAm8JUpgdoKV0qkDWTdoPMNHmfoMaHmj8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701289952; x=1701894752; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LTr7aZeHAuvEWNDeV8yoPp2AIeoMYxrruS87Jbs1XAk=; b=CvI/F6yb0FcZDbCDxLyf0wrl222RxJZ4Yrh3ZWN0P4R8Lf2XTWd8KOGAniB2ZXJQRA mwqtYa+vWbOovJNEaI0S2E5QfR/LPZlw87NLbxdLbemrKuJcPc3LC8Bjg8oCS2ssmguo e1jsXRxZH5IkXR1LXi3SuoX6f6qZG9CkVO8VSfrjZd7iLeza0Daztm7Iiajxz6G1aaw6 ATqelyU0z7Y69+UI4urRsl7zOrxNn1FCPjhZXynuiVQJ5DqbDqn1plTWg2g83BsQudvV 2ZJ81dlwfp/SLtTRfq44ImgxH3RvqAnZ3X/yD4f5OkRlBIuqaGe3DmSzkXmmUe5LrIn9 3gYQ== X-Gm-Message-State: AOJu0Ywv7v9rV+IiwvTezCarEFxJV/6BiAKL86f+gZ7s6Iu17xosmicN M/zX8/ULVug2rkgdm4UnaLX37oU3GBSctrSyVsK2+A== X-Google-Smtp-Source: AGHT+IGJ7X4o3cygkEfu2o7jV2daYQ5Mf0+OzCVF87lxHK/qHwpOk1IOuZ9FjLPjgrKUpcq5/LF3HA== X-Received: by 2002:a17:906:a1c9:b0:9be:2b53:ac4d with SMTP id bx9-20020a170906a1c900b009be2b53ac4dmr13656696ejb.74.1701289952314; Wed, 29 Nov 2023 12:32:32 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id w15-20020a17090633cf00b009dd8debf9d8sm8217992eja.157.2023.11.29.12.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 12:32:32 -0800 (PST) From: Sergey Trofimov To: guix-patches@gnu.org Subject: [PATCH] gnu: qmk: Support custom keyboards. Date: Wed, 29 Nov 2023 21:32:12 +0100 Message-ID: <940c712802a6bb69dde97dca4b6c01524d0a0a1e.1701289507.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Vagrant Cascadian Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a00:1450:4864:20::636; envelope-from=sarg@sarg.org.ru; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov 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 (-) * gnu/packages/firmware.scm (make-qmk-firmware/implementation): Add keyboard-source-directory parameter. --- gnu/packages/firmware.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 294bbea184..e06b321cde 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1406,14 +1406,16 @@ (define-public qmk (define* (make-qmk-firmware/implementation keyboard keymap #:key (description "") keymap-json - keymap-source-directory) + keymap-source-directory + keyboard-source-directory) "Return a package to build the QMK firmware for KEYBOARD with KEYMAP. -Keyboard should be the name of a sub-directory under the @file{keyboards} -directory. For custom keymaps, KEYMAP-JSON, a file-like object of a JSON -representation of KEYMAP as generated by the @url{https://config.qmk.fm/, QMK -Configurator} tool or KEYMAP-SOURCE-DIRECTORY, a file-like object directory -containing the keymap source files files such as @file{keymap.c}, can be -provided." +Keyboard should be the name of a sub-directory under the @file{keyboards} directory. +For custom keymaps, KEYMAP-JSON, a file-like object of a JSON representation of +KEYMAP as generated by the @url{https://config.qmk.fm/, QMK Configurator} tool or +KEYMAP-SOURCE-DIRECTORY, a file-like object directory containing the keymap source +files files such as @file{keymap.c}, can be provided. For keyboards not available in +upstream repository, provide a file-like object directory containing the whole +keyboard definition in KEYBOARD-SOURCE-DIRECTORY." (package (name (string-append "qmk-firmware-" (string-replace-substring keyboard "_" "-") "-" @@ -1472,6 +1474,15 @@ (define* (make-qmk-firmware/implementation keyboard keymap (base32 "1rmhm4rxvq8skxqn6vc4n4ly1ak6whj7c386zbsci4pxx548n9h4")))) "lib/lufa"))) + #$@(if keyboard-source-directory + #~((add-after 'unpack 'copy-keyboard-source-directory + (lambda _ + (let ((keyboard-dir #$(string-append "keyboards/" keyboard))) + (false-if-exception (delete-file-recursively + keyboard-dir)) + (copy-recursively #$keyboard-source-directory + keyboard-dir))))) + #~()) #$@(if keymap-source-directory #~((add-after 'unpack 'copy-keymap-source-directory (lambda _ base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 21 17:40:24 2024 Received: (at 67534) by debbugs.gnu.org; 21 Mar 2024 21:40:24 +0000 Received: from localhost ([127.0.0.1]:38292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnQ93-0004XS-Pd for submit@debbugs.gnu.org; Thu, 21 Mar 2024 17:40:24 -0400 Received: from mail-ej1-f52.google.com ([209.85.218.52]:42218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnPxL-0003rM-Pt for 67534@debbugs.gnu.org; Thu, 21 Mar 2024 17:28:17 -0400 Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a4707502aafso258561166b.0 for <67534@debbugs.gnu.org>; Thu, 21 Mar 2024 14:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1711056385; x=1711661185; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:cc:to:from:user-agent:from:to :cc:subject:date:message-id:reply-to; bh=g0359htXIhTjynsJPHoHUedsnZ5LJf9kgXohOo+KXFE=; b=XX0u7EPZNqejhOj88VMeRXfcTYoFqyH/PLa3E7zVscrqZ6d+CP6par53QO88ADni7b W6nJMxhUm2KjKVFqub2MWfurli1k3MqwJKFBLG2hLp+tBr1jn8lAf9jpiw63R+1v5MJx pb7MQC0B/V+eFBXAbpr13xOSlVcZvx8u/6teU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711056385; x=1711661185; h=mime-version:message-id:date:subject:cc:to:from:user-agent :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=g0359htXIhTjynsJPHoHUedsnZ5LJf9kgXohOo+KXFE=; b=B78Hs81iImKazXHeAzy2hS6sDaMZAU8f0B9kbN5sGNT3Qxhcw4NM1Qf7CQAUbbsgz6 NJZPwXuZkUUF3th/yVOgK4camxGDZM4aaZZ9EOXP8Heu2ml9xzUHc/aPHmYCklljblvA HViG97xaA5VCA3pFX571lM2d2lrH5/QutGhzecd4RccdoGpX5eV/B8gQhKlCTQQozGVG g2qe7wnNFWwqcIHi0mAPDRkiXGdFgwM61ekCCY4SAnVXAI0Jf/qgJtLATxo9LxFYWLnU OjLcN0z1ZdQYx8M3cta6NZ0ofOoLcbuwYliRk2czgJPU/rnhFeK3pZu6gce1U3qWsx2F LqVw== X-Gm-Message-State: AOJu0Yw8aK4PAFLhDubnUeXbgtuFSdwD3je9yOQOBA0PugYS3L/qncGC 4DJ9oopdoK0ImYW58YVibzAj8N+MgYUhkUzpjxp7myFphqn9/bb9c+VLTWaCymc2BLPocO1YBsU 7 X-Google-Smtp-Source: AGHT+IE7bLfaAFkm9LDbrE9pZkSKuIQ67x45pL9YVX3DaNQuuGdeWJ7MbrVP4/o/rS49PHJIF8rzHQ== X-Received: by 2002:a17:906:eb07:b0:a46:fabc:aacf with SMTP id mb7-20020a170906eb0700b00a46fabcaacfmr178342ejb.7.1711056385081; Thu, 21 Mar 2024 14:26:25 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id va13-20020a17090711cd00b00a4623030893sm317552ejb.126.2024.03.21.14.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 14:26:24 -0700 (PDT) User-agent: mu4e 1.10.8; emacs 29.1 From: Sergey Trofimov To: 67534@debbugs.gnu.org Subject: Requesting review Date: Thu, 21 Mar 2024 22:16:14 +0100 Message-ID: <87le6b2s5b.fsf@sarg.org.ru> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67534 Cc: maxim.cournoyer@gmail.com 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 (-) Hi Maxim, may I ask your review here, as you've authored qmk firmware package. I'm adding `keyboard-source-directory` to the `make-qmk-firmware` procedure, so that a custom firmware could be built without upstreaming a keyboard definition to the main QMK repo. Here is how I use it: https://github.com/sarg/keyboard/blob/91b87a830ef6029c1023c0d8fc877c067b12ab1e/guix.scm Best regards, Sergey From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 31 20:22:11 2024 Received: (at 67534-done) by debbugs.gnu.org; 1 Apr 2024 00:22:11 +0000 Received: from localhost ([127.0.0.1]:49082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr5RD-00074w-Ep for submit@debbugs.gnu.org; Sun, 31 Mar 2024 20:22:11 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:44426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr5RA-00073M-Di for 67534-done@debbugs.gnu.org; Sun, 31 Mar 2024 20:22:09 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-78bd8068b0fso85791285a.1 for <67534-done@debbugs.gnu.org>; Sun, 31 Mar 2024 17:22:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711930919; x=1712535719; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=NhYtP/ianEx9+J+HMabX33qcFKAlaWr8h5Yj69DVVrg=; b=N1q2UEBNYUJEjJoQpKynapQ5oAu2iJqjrM5NsW39/CFCfd27/9MG4AlP0cmiMrCTSM Vq3NmseWzNxn1N7K1lMHFbfpe6AHv2Qbh0MdBk1FEgEccDxb3a2jk2U9Ja2hjnz3GoEQ O3U40z+zKAbWxG+Km6M9hWpRjn1DDIMcP5hyDFr8h99pS4i5VMfy5gmq4bChNKqLJDBS 0vK99jIb5+PzvhK01VzFAiBDjq6HTgasElrQIM2dgzX0XB8ugpIZ9GxRQQ+lv1ei5RWe I6gPYGrWkEUWUgN0jHjGDsQuIXuPnRUlcaaaK0jRthICZd+SqA7eS/uLpw9BHuJLwOVt qopw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711930919; x=1712535719; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NhYtP/ianEx9+J+HMabX33qcFKAlaWr8h5Yj69DVVrg=; b=IqQHSjE6j2W5hXFY9dEQk6jWInMqK5grRWlWbY6IaaUWYXwI9Tsnv2KX99pD06kUCU CbjEekA3KbRf7OnDP5KATiBtbHysFoGcUPGPEyZl8G7lD/VyxiukJ+M1uxu7sMMkHpZJ Xz1Cide901AN/q44FlefaCcieXZG/QXnYTtWVglJ6t50ywNuuxTwyUUWB3ZA3M0AxkVr 8NedCiqmU9d6vWyBpDswjh7vPCca2NST8w87UF+eXCBz73TjhIs3EORidL8Yz2HhMVJM 907DCq0BVhgrEJu9aYSEQ8aokOt9Cp47yKh3VQyT9dMGzShM6x3iptHfVGnqv6Zhjlyt aJQQ== X-Gm-Message-State: AOJu0YyUTYZpTRNGnTstHzzMQ20FreBNaa2jytTtO96IxRbnEQ6dqzYp YGyVM+DB/KyoD6ErP/V3UTcba6EsWVEahT526m3DaESZyhj5NS78HVOqtOOD X-Google-Smtp-Source: AGHT+IH5iDb/NT0IC+jc57dDSoQ8TDcTqmG7hssbD6rz2T2yVlzcgOohYEBeUyG2WfBwwtYgy+90cg== X-Received: by 2002:a05:6214:1803:b0:691:3b1e:d44b with SMTP id o3-20020a056214180300b006913b1ed44bmr7628604qvw.34.1711930919381; Sun, 31 Mar 2024 17:21:59 -0700 (PDT) Received: from hurd (dsl-151-182.b2b2c.ca. [66.158.151.182]) by smtp.gmail.com with ESMTPSA id 14-20020a0562140d6e00b006990556ef8esm855502qvs.119.2024.03.31.17.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Mar 2024 17:21:58 -0700 (PDT) From: Maxim Cournoyer To: Sergey Trofimov Subject: Re: Requesting review In-Reply-To: <87le6b2s5b.fsf@sarg.org.ru> (Sergey Trofimov's message of "Thu, 21 Mar 2024 22:16:14 +0100") References: <87le6b2s5b.fsf@sarg.org.ru> Date: Sun, 31 Mar 2024 20:21:57 -0400 Message-ID: <87v852vsnu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 67534-done Cc: 67534-done@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.3 (/) Hi! Sergey Trofimov writes: > Hi Maxim, > > may I ask your review here, as you've authored qmk firmware > package. I'm adding `keyboard-source-directory` to the > `make-qmk-firmware` procedure, so that a custom firmware could be > built without upstreaming a keyboard definition to the main QMK > repo. Here is how I use it: > https://github.com/sarg/keyboard/blob/91b87a830ef6029c1023c0d8fc877c067b12ab1e/guix.scm Makes sense. I'll push shortly. -- Thanks, Maxim From unknown Sat Jun 21 03:22:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 29 Apr 2024 11:24:07 +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