gnu: python: Replace input python by python-wrapper.

* gnu/packages/{gdb.scm (gdb), cryptsetup.scm (cryptsetup),
  ghostscript.scm (ghostscript), glib.scm (glib), gnupg.scm (pius),
  gtk.scm (cairo, harfbuzz), libevent.scm (libevent), netpbm.scm (netpbm),
  oggvorbis.scm (libkate), qemu.scm (qemu), samba.scm (samba),
  texlive.scm (rubber, texlive), version-control.scm (subversion),
  xml.scm (libxml2, libxslt), xorg.scm (libxcb, mesa, xcb-proto, xorg-server),
  yasm.scm (yasm), zip.scm (zziplib)}:
  Replace input python by python-wrapper.
This commit is contained in:
Andreas Enge 2013-09-03 22:18:39 +02:00
parent 898238b9f5
commit ee3e314bb7
17 changed files with 23 additions and 23 deletions

View file

@ -45,7 +45,7 @@ (define-public cryptsetup
`(("libgcrypt" ,libgcrypt) `(("libgcrypt" ,libgcrypt)
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("popt" ,popt) ("popt" ,popt)
("python" ,python) ("python" ,python-wrapper)
("util-linux" ,util-linux))) ("util-linux" ,util-linux)))
(synopsis "hard disk encryption tool") (synopsis "hard disk encryption tool")
(description (description

View file

@ -53,7 +53,7 @@ (define-public gdb
("gmp" ,gmp) ("gmp" ,gmp)
("readline" ,readline) ("readline" ,readline)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("python" ,python) ("python" ,python-wrapper)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("dejagnu" ,dejagnu))) ("dejagnu" ,dejagnu)))
(home-page "http://www.gnu.org/software/gdb/") (home-page "http://www.gnu.org/software/gdb/")

View file

@ -136,7 +136,7 @@ (define-public ghostscript
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ; needed to find libtiff ("pkg-config" ,pkg-config) ; needed to find libtiff
("python" ,python) ("python" ,python-wrapper)
("tcl" ,tcl) ("tcl" ,tcl)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments

View file

@ -92,7 +92,7 @@ (define-public glib
("gettext" ,guix:gettext) ("gettext" ,guix:gettext)
("libffi" ,libffi) ("libffi" ,libffi)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib) ("zlib" ,zlib)
("perl" ,perl) ; needed by GIO tests ("perl" ,perl) ; needed by GIO tests
("dbus" ,dbus) ; for GDBus tests ("dbus" ,dbus) ; for GDBus tests

View file

@ -191,7 +191,7 @@ (define-public pius
"1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d")))) "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl) (inputs `(("perl" ,perl)
("python" ,python) ("python" ,python-wrapper)
("gpg" ,gnupg))) ("gpg" ,gnupg)))
(arguments (arguments
`(#:tests? #f `(#:tests? #f

View file

@ -83,7 +83,7 @@ (define-public cairo
("libspectre" ,libspectre) ("libspectre" ,libspectre)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("poppler" ,poppler) ("poppler" ,poppler)
("python" ,python) ("python" ,python-wrapper)
("xextproto" ,xextproto) ("xextproto" ,xextproto)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
@ -123,7 +123,7 @@ (define-public harfbuzz
`(("cairo" ,cairo) `(("cairo" ,cairo)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python))) ("python" ,python-wrapper)))
(synopsis "opentype text shaping engine") (synopsis "opentype text shaping engine")
(description (description
"HarfBuzz is an OpenType text shaping engine.") "HarfBuzz is an OpenType text shaping engine.")

View file

@ -44,7 +44,7 @@ (define-public libevent
;; Dependencies used for the tests and for `event_rpcgen.py'. ;; Dependencies used for the tests and for `event_rpcgen.py'.
("which" ,which) ("which" ,which)
("python" ,python))) ("python" ,python-wrapper)))
(arguments (arguments
'(#:patches (list (assoc-ref %build-inputs "patch/dns-tests")))) '(#:patches (list (assoc-ref %build-inputs "patch/dns-tests"))))
(home-page "http://libevent.org/") (home-page "http://libevent.org/")

View file

@ -57,7 +57,7 @@ (define-public netpbm
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases

View file

@ -191,7 +191,7 @@ (define-public libkate
("libogg" ,libogg) ("libogg" ,libogg)
("libpng" ,libpng) ("libpng" ,libpng)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(synopsis "kate, a karaoke and text codec for embedding in ogg") (synopsis "kate, a karaoke and text codec for embedding in ogg")
(description (description

View file

@ -94,7 +94,7 @@ (define-public qemu
`(;; ("mesa" ,mesa) `(;; ("mesa" ,mesa)
;; ("libaio" ,libaio) ;; ("libaio" ,libaio)
("glib" ,glib) ("glib" ,glib)
("python" ,python) ("python" ,python-wrapper)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("libpng" ,libpng) ("libpng" ,libpng)
("libjpeg" ,libjpeg-8) ("libjpeg" ,libjpeg-8)

View file

@ -150,7 +150,7 @@ (define-public samba
("patchelf" ,patchelf))) ; for (guix build rpath) ("patchelf" ,patchelf))) ; for (guix build rpath)
(native-inputs ; for the test suite (native-inputs ; for the test suite
`(("perl" ,perl) `(("perl" ,perl)
("python" ,python))) ("python" ,python-wrapper)))
(home-page "http://www.samba.org/") (home-page "http://www.samba.org/")
(synopsis (synopsis
"The standard Windows interoperability suite of programs for GNU and Unix") "The standard Windows interoperability suite of programs for GNU and Unix")

View file

@ -81,7 +81,7 @@ (define-public texlive
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
;; FIXME: Add interpreters fontforge and ruby, ;; FIXME: Add interpreters fontforge and ruby,
;; once they are available. ;; once they are available.
("python" ,python) ("python" ,python-wrapper)
("tcsh" ,tcsh) ("tcsh" ,tcsh)
("teckit" ,teckit) ("teckit" ,teckit)
("t1lib" ,t1lib) ("t1lib" ,t1lib)
@ -202,7 +202,7 @@ (define-public rubber
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; no `check' target (arguments '(#:tests? #f)) ; no `check' target
(inputs `(("texinfo" ,texinfo) (inputs `(("texinfo" ,texinfo)
("python" ,python) ("python" ,python-wrapper)
("which" ,which))) ("which" ,which)))
(home-page "https://launchpad.net/rubber") (home-page "https://launchpad.net/rubber")
(synopsis "Rubber, a wrapper for LaTeX and friends") (synopsis "Rubber, a wrapper for LaTeX and friends")

View file

@ -126,7 +126,7 @@ (define-public subversion
`(("apr" ,apr) `(("apr" ,apr)
("apr-util" ,apr-util) ("apr-util" ,apr-util)
("perl" ,perl) ("perl" ,perl)
("python" ,python) ("python" ,python-wrapper)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "http://subversion.apache.org/") (home-page "http://subversion.apache.org/")

View file

@ -66,7 +66,7 @@ (define-public libxml2
(home-page "http://www.xmlsoft.org/") (home-page "http://www.xmlsoft.org/")
(synopsis "libxml2, a C parser for XML") (synopsis "libxml2, a C parser for XML")
(inputs `(("perl" ,perl) (inputs `(("perl" ,perl)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:phases `(#:phases
@ -102,7 +102,7 @@ (define-public libxslt
(synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents") (synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents")
(inputs `(("libgcrypt" ,libgcrypt) (inputs `(("libgcrypt" ,libgcrypt)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("python" ,python) ("python" ,python-wrapper)
("zlib" ,zlib))) ("zlib" ,zlib)))
(description (description
"Libxslt is an XSLT C library developed for the GNOME project. It is "Libxslt is an XSLT C library developed for the GNOME project. It is

View file

@ -1857,7 +1857,7 @@ (define-public xcb-proto
"0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("pkg-config" ,pkg-config) ("python" ,python))) `(("pkg-config" ,pkg-config) ("python" ,python-wrapper)))
(home-page "http://www.x.org/wiki/") (home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System") (synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System") (description "X.org provides an implementation of the X Window System")
@ -4169,7 +4169,7 @@ (define-public mesa
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("makedepend" ,makedepend) ("makedepend" ,makedepend)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python))) ("python" ,python-wrapper)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
@ -4215,7 +4215,7 @@ (define-public libxcb
`(("xcb-proto" ,xcb-proto) `(("xcb-proto" ,xcb-proto)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python))) ("python" ,python-wrapper)))
(home-page "http://www.x.org/wiki/") (home-page "http://www.x.org/wiki/")
(synopsis "xorg implementation of the X Window System") (synopsis "xorg implementation of the X Window System")
(description "X.org provides an implementation of the X Window System") (description "X.org provides an implementation of the X Window System")
@ -4270,7 +4270,7 @@ (define-public xorg-server
("mesa" ,mesa) ("mesa" ,mesa)
("openssl" ,openssl) ("openssl" ,openssl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python-wrapper)
("recordproto" ,recordproto) ("recordproto" ,recordproto)
("resourceproto" ,resourceproto) ("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto) ("scrnsaverproto" ,scrnsaverproto)

View file

@ -40,7 +40,7 @@ (define-public yasm
"0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn")))) "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("python" ,python) `(("python" ,python-wrapper)
("xmlto" ,xmlto))) ("xmlto" ,xmlto)))
(home-page "http://yasm.tortall.net/") (home-page "http://yasm.tortall.net/")
(synopsis "Rewrite of the NASM assembler") (synopsis "Rewrite of the NASM assembler")

View file

@ -120,7 +120,7 @@ (define-public zziplib
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("perl" ,perl) ; for the documentation (inputs `(("perl" ,perl) ; for the documentation
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ; for the documentation ("python" ,python-wrapper) ; for the documentation
("zip" ,zip) ; to create test files ("zip" ,zip) ; to create test files
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments