From patchwork Mon Feb 1 20:24:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 26814 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 8D5AC27BC24; Mon, 1 Feb 2021 20:25:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, 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 ESMTPS id 00EE927BC27 for ; Mon, 1 Feb 2021 20:25:12 +0000 (GMT) Received: from localhost ([::1]:55238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6fl1-0007xq-6D for patchwork@mira.cbaines.net; Mon, 01 Feb 2021 15:25:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6fks-0007xY-Mc for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6fks-0001Iy-Fm for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6fks-00027X-CC for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46245] [PATCH 1/2] gnu: python-xlib: Update to 0.29. References: <87o8h3fsiv.fsf@cbaines.net> In-Reply-To: <87o8h3fsiv.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 20:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46245 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46245@debbugs.gnu.org Received: via spool by 46245-submit@debbugs.gnu.org id=B46245.16122111018136 (code B ref 46245); Mon, 01 Feb 2021 20:25:02 +0000 Received: (at 46245) by debbugs.gnu.org; 1 Feb 2021 20:25:01 +0000 Received: from localhost ([127.0.0.1]:33345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6fkr-000278-85 for submit@debbugs.gnu.org; Mon, 01 Feb 2021 15:25:01 -0500 Received: from mira.cbaines.net ([212.71.252.8]:58648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6fkp-00026u-Kr for 46245@debbugs.gnu.org; Mon, 01 Feb 2021 15:25:00 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id B7A2227BC1D for <46245@debbugs.gnu.org>; Mon, 1 Feb 2021 20:24:58 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6a6c992e for <46245@debbugs.gnu.org>; Mon, 1 Feb 2021 20:24:58 +0000 (UTC) From: Christopher Baines Date: Mon, 1 Feb 2021 20:24:57 +0000 Message-Id: <20210201202458.30619-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 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 Make python-six a propagated input as it's used at runtime. * gnu/packages/python-xyz.scm (python-xlib): Update to 0.29. [native-inputs]: Move python-six to… [propagated-inputs]: …here. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5199ac4d11..5ee4120666 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8014,7 +8014,7 @@ falling into the Python interpreter.") (define-public python-xlib (package (name "python-xlib") - (version "0.27") + (version "0.29") (source (origin (method git-fetch) @@ -8023,7 +8023,7 @@ falling into the Python interpreter.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09kimic8rhprx3q8nzalc4aggg42ahqm4v5qcj8dm68yvxfdk986")))) + (base32 "17cwd2knqm2vwrii3kqii9abwsnydhpg4byqx1vy7rjs6i1vbqfc")))) (build-system python-build-system) (arguments `(#:phases @@ -8039,8 +8039,9 @@ falling into the Python interpreter.") (native-inputs `(("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm) - ("python-six" ,python-six) ("xorg-server" ,xorg-server))) + (propagated-inputs + `(("python-six" ,python-six))) (home-page "https://github.com/python-xlib/python-xlib") (synopsis "Python X11 client library") (description From patchwork Mon Feb 1 20:24:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 26815 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 1EA2C27BC24; Mon, 1 Feb 2021 20:25:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, 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 ESMTPS id 1530427BC1D for ; Mon, 1 Feb 2021 20:25:13 +0000 (GMT) Received: from localhost ([::1]:55266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6fl2-0007yn-9n for patchwork@mira.cbaines.net; Mon, 01 Feb 2021 15:25:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6fkt-0007xZ-2Q for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6fks-0001J2-S0 for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6fks-00027f-P4 for guix-patches@gnu.org; Mon, 01 Feb 2021 15:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46245] [PATCH 2/2] gnu: plover: Update to 4.0.0.dev8. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Feb 2021 20:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46245 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46245@debbugs.gnu.org Received: via spool by 46245-submit@debbugs.gnu.org id=B46245.16122111028149 (code B ref 46245); Mon, 01 Feb 2021 20:25:02 +0000 Received: (at 46245) by debbugs.gnu.org; 1 Feb 2021 20:25:02 +0000 Received: from localhost ([127.0.0.1]:33347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6fkr-00027C-Iz for submit@debbugs.gnu.org; Mon, 01 Feb 2021 15:25:01 -0500 Received: from mira.cbaines.net ([212.71.252.8]:58650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6fkp-00026v-M1 for 46245@debbugs.gnu.org; Mon, 01 Feb 2021 15:25:00 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id C3D5027BC24 for <46245@debbugs.gnu.org>; Mon, 1 Feb 2021 20:24:58 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d92a88ed for <46245@debbugs.gnu.org>; Mon, 1 Feb 2021 20:24:58 +0000 (UTC) From: Christopher Baines Date: Mon, 1 Feb 2021 20:24:58 +0000 Message-Id: <20210201202458.30619-2-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210201202458.30619-1-mail@cbaines.net> References: <20210201202458.30619-1-mail@cbaines.net> MIME-Version: 1.0 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 This moves from Python 2 to Python 3. This is a dev release, but from nearly 2 years ago. Backing up your plover.cfg is advised by the release notes when upgrading from version 3 to 4. * gnu/packages/stenography.scm (plover): Update to 4.0.0.dev8. [arguments]: Remove. [native-inputs]: Switch to Python 3 package variants. [inputs]: Switch to Python 3 package variants, and add python-pyqt. --- gnu/packages/stenography.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm index c462deacfa..979b2c29ef 100644 --- a/gnu/packages/stenography.scm +++ b/gnu/packages/stenography.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2021 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages qt) #:use-module (gnu packages check) #:use-module (gnu packages libusb) #:use-module (gnu packages python) @@ -31,7 +33,7 @@ (define-public plover (package (name "plover") - (version "3.1.1") + (version "4.0.0.dev8") (source (origin (method git-fetch) @@ -40,21 +42,21 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "114rlxvq471fyifwcdcgdad79ak7q3w2lk8z9nqhz1i9fg05721c")))) + (base32 "1b2ys77bkjsdmyg97i7lq3lj45q56bycvsm06d4rs656kxhvc0a3")))) (build-system python-build-system) - (arguments - `(#:python ,python-2)) (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-pytest" ,python2-pytest) - ("python2-setuptools-scm" ,python2-setuptools-scm))) + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (inputs - `(("python2-appdirs" ,python2-appdirs) - ("python2-dbus" ,python2-dbus) - ("python2-hidapi" ,python2-hidapi) - ("python2-pyserial" ,python2-pyserial) - ("python2-wxpython" ,python2-wxpython) - ("python2-xlib" ,python2-xlib))) + `(("python-appdirs" ,python-appdirs) + ("python-pyqt" ,python-pyqt) + ("python-babel" ,python-babel) + ("python-dbus" ,python-dbus) + ("python-hidapi" ,python-hidapi) + ("python-pyserial" ,python-pyserial) + ("python-wxpython" ,python-wxpython) + ("python-xlib" ,python-xlib))) (home-page "https://www.openstenoproject.org/plover/") (synopsis "Stenography engine") (description