[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: python-pyqt-4: Remove variable.
From: |
Efraim Flashner |
Subject: |
02/04: gnu: python-pyqt-4: Remove variable. |
Date: |
Sun, 22 Jul 2018 13:43:20 -0400 (EDT) |
efraim pushed a commit to branch qt-updates
in repository guix.
commit bba6069708fa5acc5c05922a14bfcd9472c0b945
Author: Efraim Flashner <address@hidden>
Date: Sun Jul 22 11:36:59 2018 +0300
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.
---
gnu/packages/qt.scm | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cb02fba..d01277b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1748,9 +1748,9 @@ contain over 620 classes.")
("python2-enum34" ,python2-enum34)
,@(alist-delete "python" (package-inputs python-pyqt))))))
-(define-public python-pyqt-4
+(define-public python2-pyqt-4
(package (inherit python-pyqt)
- (name "python-pyqt")
+ (name "python2-pyqt")
(version "4.12")
(source
(origin
@@ -1763,9 +1763,9 @@ contain over 620 classes.")
(base32
"1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"))))
(native-inputs
- `(("python-sip" ,python-sip)
+ `(("python-sip" ,python2-sip)
("qt" ,qt-4)))
- (inputs `(("python" ,python-wrapper)))
+ (inputs `(("python" ,python-2)))
(arguments
`(#:tests? #f ; no check target
#:modules ((srfi srfi-1)
@@ -1794,15 +1794,6 @@ contain over 620 classes.")
"--sipdir" sip))))))))
(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
(package
(name "qscintilla")