nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Add prefix to license imports in (gnu packages qt). 

* gnu/packages/qt.scm: Import (guix licenses) with prefix
  "license:".
This commit is contained in:
David Craven 2016-08-25 20:45:07 +02:00
parent ed02e1fec8
commit 225941b028
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/qt.scm
View File

@ -20,7 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages qt) (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 packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build utils) #:use-module (guix build utils)
@ -206,7 +206,7 @@
(synopsis "Cross-platform GUI library") (synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for (description "Qt is a cross-platform application and UI framework for
developers using C++ or QML, a CSS & JavaScript like language.") 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; ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS;
;; see <http://hydra.gnu.org/build/112828>. ;; see <http://hydra.gnu.org/build/112828>.
@ -491,7 +491,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(synopsis "Cross-platform GUI library") (synopsis "Cross-platform GUI library")
(description "Qt is a cross-platform application and UI framework for (description "Qt is a cross-platform application and UI framework for
developers using C++ or QML, a CSS & JavaScript like language.") 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 (define-public qtsvg
(package (inherit qtbase) (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.") module provides support functions to the automatically generated code.")
;; There is a choice between a python like license, gpl2 and gpl3. ;; There is a choice between a python like license, gpl2 and gpl3.
;; For compatibility with pyqt, we need gpl3. ;; For compatibility with pyqt, we need gpl3.
(license gpl3))) (license license:gpl3)))
(define-public python2-sip (define-public python2-sip
(package (inherit python-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 "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 framework. The bindings are implemented as a set of Python modules and
contain over 620 classes.") contain over 620 classes.")
(license gpl3))) (license license:gpl3)))
(define-public python2-pyqt (define-public python2-pyqt
(package (inherit python-pyqt) (package (inherit python-pyqt)
@ -1067,7 +1067,7 @@ contain over 620 classes.")
"--destdir" lib "--destdir" lib
"--sipdir" sip)))) "--sipdir" sip))))
%standard-phases))) %standard-phases)))
(license (list gpl2 gpl3)))) ; choice of either license (license (list license:gpl2 license:gpl3)))) ; choice of either license
(define-public qtkeychain (define-public qtkeychain
(package (package
@ -1101,4 +1101,4 @@ contain over 620 classes.")
(description (description
"QtKeychain is a Qt library to store passwords and other secret data "QtKeychain is a Qt library to store passwords and other secret data
securely. It will not store any data unencrypted unless explicitly requested.") securely. It will not store any data unencrypted unless explicitly requested.")
(license bsd-3))) (license license:bsd-3)))