From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 02/31] gnu: qt: Import licenses using #:prefix license:. Date: Fri, 26 Aug 2016 23:52:31 +0200 Message-ID: <20160826215300.12913-3-david@craven.ch> References: <20160826215300.12913-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdP4B-0000am-QZ for guix-devel@gnu.org; Fri, 26 Aug 2016 17:53:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bdP43-0005kw-3Y for guix-devel@gnu.org; Fri, 26 Aug 2016 17:53:32 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:55003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdP41-0005jv-Sb for guix-devel@gnu.org; Fri, 26 Aug 2016 17:53:27 -0400 In-Reply-To: <20160826215300.12913-1-david@craven.ch> 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: guix-devel@gnu.org * gnu/packages/qt.scm (qt)[license]: Use license:. (qt-4)[license]: Use license:. (qtbase)[license]: Use license:. (python-sip)[license]: Use license:. (python-pyqt)[license]: Use license:. (qtkeychain)[license]: Use license:. --- gnu/packages/qt.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5a93ea2..95690fa 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,7 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages qt) - #:use-module ((guix licenses) #:select (bsd-3 gpl2 gpl3 lgpl2.1 lgpl2.1+ lgpl3 x11-style)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build utils) @@ -206,7 +206,7 @@ (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for developers using C++ or QML, a CSS & JavaScript like language.") - (license lgpl2.1) + (license license:lgpl2.1) ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; ;; see . @@ -491,7 +491,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (synopsis "Cross-platform GUI library") (description "Qt is a cross-platform application and UI framework for developers using C++ or QML, a CSS & JavaScript like language.") - (license (list lgpl2.1 lgpl3)))) + (license (list license:lgpl2.1 license:lgpl3)))) (define-public qtsvg (package (inherit qtbase) @@ -920,7 +920,7 @@ is then compiled to create the bindings extension module. The SIP Python module provides support functions to the automatically generated code.") ;; There is a choice between a python like license, gpl2 and gpl3. ;; For compatibility with pyqt, we need gpl3. - (license gpl3))) + (license license:gpl3))) (define-public python2-sip (package (inherit python-sip) @@ -985,7 +985,7 @@ module provides support functions to the automatically generated code.") "PyQt is a set of Python v2 and v3 bindings for the Qt application framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") - (license gpl3))) + (license license:gpl3))) (define-public python2-pyqt (package (inherit python-pyqt) @@ -1067,7 +1067,7 @@ contain over 620 classes.") "--destdir" lib "--sipdir" sip)))) %standard-phases))) - (license (list gpl2 gpl3)))) ; choice of either license + (license (list license:gpl2 license:gpl3)))) ; choice of either license (define-public qtkeychain (package @@ -1101,4 +1101,4 @@ contain over 620 classes.") (description "QtKeychain is a Qt library to store passwords and other secret data securely. It will not store any data unencrypted unless explicitly requested.") - (license bsd-3))) + (license license:bsd-3))) -- 2.9.0