From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: %desktop-services now depends on Qt 5, via colord Date: Thu, 19 Jul 2018 21:20:21 +0300 Message-ID: <20180719182021.GM4585@macbook41> References: <20180621165415.31705.87450@vcs0.savannah.gnu.org> <20180621165418.1C11520349@vcs0.savannah.gnu.org> <874lh1snnd.fsf_-_@netris.org> <20180714192644.GH4585@macbook41> <874lgzunv9.fsf@netris.org> <87r2jzqnrk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LqInKle6vr1NBc7W" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgDXQ-0002Y2-5x for guix-devel@gnu.org; Thu, 19 Jul 2018 14:20:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgDXM-0004sv-5U for guix-devel@gnu.org; Thu, 19 Jul 2018 14:20:28 -0400 Content-Disposition: inline In-Reply-To: <87r2jzqnrk.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --LqInKle6vr1NBc7W Content-Type: multipart/mixed; boundary="QAdlk5ze2izLk3Ap" Content-Disposition: inline --QAdlk5ze2izLk3Ap Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 19, 2018 at 04:54:39PM +0200, Ludovic Court=C3=A8s wrote: > Hello, >=20 > Mark H Weaver skribis: >=20 > > Efraim Flashner writes: > >> It sounds like adding Qt to hplip adds plenty of GUI goodies. Could we > >> leave hplip as-is and have sane-backends depend on a Qt-less > >> hplip-minimal or hplip-nogui, since it shouldn't need any GUI from hpl= ip? > > > > I haven't looked closely, but that sounds like a good approach. >=20 > +1 for not having Qt in %desktop-services. >=20 I feel like I got volunteered to make the patch ;p. I also changed the documentation to suggest using 'hplip-minimal' in the cups service, since that's another place where it could be brought in easily. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --QAdlk5ze2izLk3Ap Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-Add-hplip-minimal.patch" Content-Transfer-Encoding: quoted-printable =46rom b8c78ac0b6904c92cb4253c0eec72818469d90cf Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Thu, 19 Jul 2018 21:16:43 +0300 Subject: [PATCH] gnu: Add hplip-minimal. * gnu/packages/cups.scm (hplip-minimal): New variable. * gnu/packages/scanner.scm (sane-backends)[inputs]: Replace hplip with hplip-minimal. * doc/guix.texi (Printing Services): Change example code to use hplip-minimal in place of hplip. Add note explaining when use hplip. --- doc/guix.texi | 8 ++++++-- gnu/packages/cups.scm | 19 +++++++++++++++++-- gnu/packages/scanner.scm | 3 ++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 84347d156..541119d1e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12141,7 +12141,7 @@ secure connections to the print server. =20 Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and for HP -printers @i{via} the @code{hplip} package. You can do that directly, +printers @i{via} the @code{hplip-minimal} package. You can do that direct= ly, like this (you need to use the @code{(gnu packages cups)} module): =20 @example @@ -12149,9 +12149,13 @@ like this (you need to use the @code{(gnu packages= cups)} module): (cups-configuration (web-interface? #t) (extensions - (list cups-filters escpr hplip)))) + (list cups-filters escpr hplip-minimal)))) @end example =20 +Note: If you wish to use the Qt5 based GUI which comes with the hplip +package then it is suggested that you install the @code{hplip} package, +either in your OS configuration file or as your user. + The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bfc587a6f..04d4e3fad 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Ricardo Wurmus ;;; Copyright =C2=A9 2015, 2016, 2017 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2015, 2016, 2017 Efraim Flashner +;;; Copyright =C2=A9 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright =C2=A9 2016 Danny Milosavljevic ;;; Copyright =C2=A9 2017 Leo Famulari ;;; Copyright =C2=A9 2017 Mark H Weaver @@ -46,7 +46,9 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) =20 (define-public cups-filters (package @@ -520,6 +522,19 @@ device-specific programs to convert and print many typ= es of files.") `(("perl" ,perl) ("pkg-config" ,pkg-config))))) =20 +(define-public hplip-minimal + (package + (inherit hplip) + (name "hplip-minimal") + (arguments + (substitute-keyword-arguments (package-arguments hplip) + ((#:configure-flags cf) + ``(,@(delete "--enable-qt5" ,cf))))) + (inputs + `(,@(fold alist-delete (package-inputs hplip) + '("python-pygobject" "python-pyqt")))) + (synopsis "GUI-less version of hplip"))) + (define-public foomatic-filters (package (name "foomatic-filters") diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 33a573d53..d030d8ade 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2015 Andy Wingo ;;; Copyright =C2=A9 2016 Andy Patterson ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -102,7 +103,7 @@ package contains the library, but no drivers.") (inherit sane-backends-minimal) (name "sane-backends") (inputs - `(("hplip" ,(@ (gnu packages cups) hplip)) + `(("hplip" ,(@ (gnu packages cups) hplip-minimal)) ,@(package-inputs sane-backends-minimal))) (arguments (substitute-keyword-arguments (package-arguments sane-backends-minima= l) --=20 2.18.0 --QAdlk5ze2izLk3Ap-- --LqInKle6vr1NBc7W Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAltQ1mUACgkQQarn3Mo9 g1FXqxAAkbTnk4bBo9k9dGmm6Kspg8GrSlKlJD+OaDdm/b3tK56dUlMNrdAbQ0uy VmVXkak9Cc455QehINReuCiU2lg7/eNyV2CS52ChP3/JxDYnFLPGK4WNq0sRl16c rFrHdbjyBmek7cGdsbOg5uk2KFCoWV24Pcx4HDkworcXpeIXSk0Zs0MWgu1kMq/A 4mFl+7T99HU/RkAoiXTaSB3Gho2CQ0JF9QCFYafiXmazmZz5/2ml6j7vHL76a86Z MxEV33orVKnqUYjv6kPoaUao5ldSRIQ6leSHwhZnxtgqFhqtRaafpQU/NlLRzinH jZ+Lzq0kZkbjgXYYlxdG0qm9VtUYDlTw7xrWO4OF3ql/RNLhpO8SAQGtCncHVOSI DCgQqV6ICbZKgvW1AvE2NWEoVFYjGAlXb315u04HE5mMlN7U+3kByd1f0kJk4xPG XPxDD/kEl+VfRXr5wmU6p+8sv0sLw031gA1pQAlnGXPP4qQr1ESfFWckuOfxIqRy /28ZVh+oYIMaT1SQYvTFenNcM6xeAmR4ptqCHc9aZk02Q1SGPZA5mbBl5tNmf+lO Cww2vnAnd3JQlCx05hwa2doE5VCauxXSZszo+9hIQP3wNIl2lDfdSixpwLsWchJz 7hBnH6mMjSdxixzvVFogB+qwMC+fiqFv8ey7zuK8iaHtOlIIf1M= =p0cE -----END PGP SIGNATURE----- --LqInKle6vr1NBc7W--