From patchwork Sun Aug 2 20:49:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 23500 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3E42D27BBE4; Sun, 2 Aug 2020 21:50:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id F07C527BBE3 for ; Sun, 2 Aug 2020 21:50:20 +0100 (BST) Received: from localhost ([::1]:59400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2Kw0-00068B-FX for patchwork@mira.cbaines.net; Sun, 02 Aug 2020 16:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Kvi-00066K-Qj for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Kvi-0002vF-Hf for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k2Kvi-00035R-Gr for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42682] [PATCH 1/2] gnu: Add python-hjson. References: <20200802204208.14992-1-tona_kosmicznego_smiecia@interia.pl> In-Reply-To: <20200802204208.14992-1-tona_kosmicznego_smiecia@interia.pl> Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Aug 2020 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42682@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42682-submit@debbugs.gnu.org id=B42682.159640136511805 (code B ref 42682); Sun, 02 Aug 2020 20:50:02 +0000 Received: (at 42682) by debbugs.gnu.org; 2 Aug 2020 20:49:25 +0000 Received: from localhost ([127.0.0.1]:43589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2Kv6-00034L-HQ for submit@debbugs.gnu.org; Sun, 02 Aug 2020 16:49:24 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:53828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2Kv4-000347-Di for 42682@debbugs.gnu.org; Sun, 02 Aug 2020 16:49:23 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 2 Aug 2020 22:49:16 +0200 (CEST) From: Jan Wielkiewicz Date: Sun, 2 Aug 2020 22:49:09 +0200 Message-Id: <20200802204910.15356-1-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1596401356; bh=5kkVet0e13AtGNI/CVB2eEqoLogAgEyw0Id4/8ulwtE=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Interia-Antivirus; b=CdFQv+6ARvrgAdn7ruKUjlRBuvknMdbTVvxkopG68JrWMXZtimsGn5gZs6fl9pM4Q AHduuKWzI20EBr0HyflAVsiontFRkzhzylvGKlkRIu9okl8LOLjSbZt7JYhyf2eXd2 u+bL2xGAsd42wID3kl2oxQ0iG838ReSOSOpHHQnE= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-hjson): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ab0b12383..316865ddf1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -83,6 +83,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2020 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -21298,3 +21299,22 @@ and have a maximum lifetime built-in.") "This package contains a small collection of test tool plugins for @code{nose2} and @code{flake8}.") (license license:asl2.0))) + +(define-public python-hjson + (package + (name "python-hjson") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hjson" version)) + (sha256 + (base32 + "1yaimcgz8w0ps1wk28wk9g9zdidp79d14xqqj9rjkvxalvx2f5qx")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; no tests + (home-page "http://github.com/hjson/hjson-py") + (synopsis "User interface for JSON.") + (description "Hjson, a user interface for JSON.") + (license license:expat))) From patchwork Sun Aug 2 20:49:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Wielkiewicz X-Patchwork-Id: 23499 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E8AF527BBE4; Sun, 2 Aug 2020 21:50:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6C30A27BBE3 for ; Sun, 2 Aug 2020 21:50:19 +0100 (BST) Received: from localhost ([::1]:59346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2Kvy-00066e-Vj for patchwork@mira.cbaines.net; Sun, 02 Aug 2020 16:50:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Kvj-00066R-6h for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Kvi-0002vJ-UM for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k2Kvi-00035Z-TC for guix-patches@gnu.org; Sun, 02 Aug 2020 16:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42682] [PATCH 2/2] gnu: Add qmk-cli. Resent-From: Jan Wielkiewicz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Aug 2020 20:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42682@debbugs.gnu.org Cc: Jan Wielkiewicz Received: via spool by 42682-submit@debbugs.gnu.org id=B42682.159640137611829 (code B ref 42682); Sun, 02 Aug 2020 20:50:02 +0000 Received: (at 42682) by debbugs.gnu.org; 2 Aug 2020 20:49:36 +0000 Received: from localhost ([127.0.0.1]:43592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2KvH-00034j-Ve for submit@debbugs.gnu.org; Sun, 02 Aug 2020 16:49:36 -0400 Received: from smtpo.poczta.interia.pl ([217.74.65.153]:50370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k2KvG-00034W-7G for 42682@debbugs.gnu.org; Sun, 02 Aug 2020 16:49:34 -0400 X-Interia-R: Interia X-Interia-R-IP: 89.64.43.25 X-Interia-R-Helo: Received: from localhost.localdomain (89-64-43-25.dynamic.chello.pl [89.64.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by poczta.interia.pl (INTERIA.PL) with ESMTPSA; Sun, 2 Aug 2020 22:49:28 +0200 (CEST) From: Jan Wielkiewicz Date: Sun, 2 Aug 2020 22:49:10 +0200 Message-Id: <20200802204910.15356-2-tona_kosmicznego_smiecia@interia.pl> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200802204910.15356-1-tona_kosmicznego_smiecia@interia.pl> References: <20200802204910.15356-1-tona_kosmicznego_smiecia@interia.pl> MIME-Version: 1.0 X-Interia-Antivirus: OK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=interia.pl; s=biztos; t=1596401368; bh=yGhINnQXUhTokQTR1bYYv8RsbaqkBiRrA/6l+5PW+HQ=; h=X-Interia-R:X-Interia-R-IP:X-Interia-R-Helo:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Type:Content-Transfer-Encoding:X-Interia-Antivirus; b=uqnBIFzKkzEbDomWNSwMm+WuW2aYL8WGD/KEbuxGGYDN5A44e6hzeo5yEKmBVTOV+ GFTTjTmBbQSYqRc6rshIUqMcuFrT2zl4MwcM1hvakxd/UJhH1V6lU5vWGOZsTr7Q3g e1QB26YhhjIFBqk0WIWeFksNR/9VPTlbaSS1etgA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hardware.scm (qmk-cli): New variable. --- gnu/packages/hardware.scm | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 211a5a34ac..adab986d75 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Jan Wielkiewicz ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hardware) + #:use-module (gnu packages avr) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) @@ -27,6 +29,8 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages embedded) + #:use-module (gnu packages flashing-tools) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages libusb) @@ -36,10 +40,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -465,3 +473,45 @@ authorization policies (what kind of USB devices are authorized) as well as method of use policies (how a USB device may interact with the system). Simply put, it is a USB device whitelisting tool.") (license license:gpl2))) + +(define-public qmk-cli + (package + (name "qmk-cli") + (version "0.0.35") + (source + (origin + (method url-fetch) + (uri (pypi-uri "qmk" version)) + (sha256 + (base32 + "1dd3q38r5bs9ih8jiwsb7q2655wyka2a8wlwv7yln9narlqwl177")))) + (build-system python-build-system) + (propagated-inputs + `(("arm-none-eabi-gcc" ,gcc-arm-none-eabi-7-2018-q2-update) + ("avr-gcc" ,avr-toolchain-5) + ("avrdude" ,avrdude) + ("dfu-programmer" ,dfu-programmer) + ("dfu-util" ,dfu-util) + ("git" ,git) + ("python3" ,python) + ("python-appdirs" ,python-appdirs) + ("python-argcomplete" ,python-argcomplete) + ("python-colorama" ,python-colorama) + ("python-flake8" ,python-flake8) + ("python-hjson" ,python-hjson) + ("python-nose2" ,python-nose2) + ("python-yapf" ,python-yapf))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'set-qmk-home + (lambda _ + ;; tests fail without this variable set + (setenv "QMK_HOME" + "") + #t))))) + (home-page "https://github.com/qmk/qmk_cli") + (synopsis + "Tools for developing QMK Firmware") + (description + "A program to help users work with QMK Firmware.") + (license license:expat)))