1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 12:01:49 +02:00

Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Efraim Flashner
2020-12-30 10:53:39 +02:00
17 changed files with 790 additions and 654 deletions
+5 -4
View File
@@ -2220,7 +2220,7 @@ itself.")
(define-public python2-pyqt-4
(package (inherit python-pyqt)
(name "python2-pyqt")
(version "4.12")
(version "4.12.3")
(source
(origin
(method url-fetch)
@@ -2230,11 +2230,12 @@ itself.")
version ".tar.gz"))
(sha256
(base32
"1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"))))
"0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0"))))
(native-inputs
`(("python-sip" ,python2-sip)
("qt" ,qt-4)))
`(("qt" ,qt-4)))
(inputs `(("python" ,python-2)))
(propagated-inputs
`(("python-sip" ,python2-sip)))
(arguments
`(#:tests? #f ; no check target
#:modules ((srfi srfi-1)