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

gnu: python-pyqt-4: Remove variable. 

* gnu/packages/qt.scm (python-pyqt-4): Remove variable.
(python2-pyqt-4): Don't inherit from python-pyqt-4.
master
Efraim Flashner 2018-07-22 11:36:59 +03:00
parent e1846928ee
commit bba6069708
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/qt.scm
View File

@ -1748,9 +1748,9 @@ contain over 620 classes.")
("python2-enum34" ,python2-enum34) ("python2-enum34" ,python2-enum34)
,@(alist-delete "python" (package-inputs python-pyqt)))))) ,@(alist-delete "python" (package-inputs python-pyqt))))))
(define-public python-pyqt-4 (define-public python2-pyqt-4
(package (inherit python-pyqt) (package (inherit python-pyqt)
(name "python-pyqt") (name "python2-pyqt")
(version "4.12") (version "4.12")
(source (source
(origin (origin
@ -1763,9 +1763,9 @@ contain over 620 classes.")
(base32 (base32
"1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w")))) "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"))))
(native-inputs (native-inputs
`(("python-sip" ,python-sip) `(("python-sip" ,python2-sip)
("qt" ,qt-4))) ("qt" ,qt-4)))
(inputs `(("python" ,python-wrapper))) (inputs `(("python" ,python-2)))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
@ -1794,15 +1794,6 @@ contain over 620 classes.")
"--sipdir" sip)))))))) "--sipdir" sip))))))))
(license (list license:gpl2 license:gpl3)))) ; choice of either license (license (list license:gpl2 license:gpl3)))) ; choice of either license
(define-public python2-pyqt-4
(package (inherit python-pyqt-4)
(name "python2-pyqt")
(native-inputs
`(("python-sip" ,python2-sip)
("qt" ,qt-4)))
(inputs
`(("python" ,python-2)))))
(define-public qscintilla (define-public qscintilla
(package (package
(name "qscintilla") (name "qscintilla")