summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-07-22 11:36:59 +0300
committerEfraim Flashner <efraim@flashner.co.il>2018-07-22 20:42:48 +0300
commitbba6069708fa5acc5c05922a14bfcd9472c0b945 (patch)
treec7801407a2ca20cee3b90d0935ad8cd489216c3f /gnu/packages
parente1846928eeb763c724f18e1dc081dacb37c155b4 (diff)
downloadguix-bba6069708fa5acc5c05922a14bfcd9472c0b945.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/qt.scm17
1 files changed, 4 insertions, 13 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cb02fbaa42..d01277bc9b 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")