~ruther/guix-local

ee3e314bb7ba376c7e8c95c3da1f64ba07d57847 — Andreas Enge 12 years ago 898238b
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.
M gnu/packages/cryptsetup.scm => gnu/packages/cryptsetup.scm +1 -1
@@ 45,7 45,7 @@
    `(("libgcrypt" ,libgcrypt)
      ("lvm2" ,lvm2)
      ("popt" ,popt)
      ("python" ,python)
      ("python" ,python-wrapper)
      ("util-linux" ,util-linux)))
   (synopsis "hard disk encryption tool")
   (description

M gnu/packages/gdb.scm => gnu/packages/gdb.scm +1 -1
@@ 53,7 53,7 @@
       ("gmp" ,gmp)
       ("readline" ,readline)
       ("ncurses" ,ncurses)
       ("python" ,python)
       ("python" ,python-wrapper)
       ("texinfo" ,texinfo)
       ("dejagnu" ,dejagnu)))
    (home-page "http://www.gnu.org/software/gdb/")

M gnu/packages/ghostscript.scm => gnu/packages/ghostscript.scm +1 -1
@@ 136,7 136,7 @@ printing, and psresize, for adjusting page sizes.")
             ("libtiff" ,libtiff)
             ("perl" ,perl)
             ("pkg-config" ,pkg-config) ; needed to find libtiff
             ("python" ,python)
             ("python" ,python-wrapper)
             ("tcl" ,tcl)
             ("zlib" ,zlib)))
   (arguments

M gnu/packages/glib.scm => gnu/packages/glib.scm +1 -1
@@ 92,7 92,7 @@ shared NFS home directories.")
      ("gettext" ,guix:gettext)
      ("libffi" ,libffi)
      ("pkg-config" ,pkg-config)
      ("python" ,python)
      ("python" ,python-wrapper)
      ("zlib" ,zlib)
      ("perl" ,perl)                              ; needed by GIO tests
      ("dbus" ,dbus)                              ; for GDBus tests

M gnu/packages/gnupg.scm => gnu/packages/gnupg.scm +1 -1
@@ 191,7 191,7 @@ S/MIME.")
                     "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
   (build-system gnu-build-system)
   (inputs `(("perl" ,perl)
             ("python" ,python)
             ("python" ,python-wrapper)
             ("gpg" ,gnupg)))
   (arguments
    `(#:tests? #f

M gnu/packages/gtk.scm => gnu/packages/gtk.scm +2 -2
@@ 83,7 83,7 @@ tools have full access to view and control running applications.")
      ("libspectre" ,libspectre)
      ("pkg-config" ,pkg-config)
      ("poppler" ,poppler)
      ("python" ,python)
      ("python" ,python-wrapper)
      ("xextproto" ,xextproto)
      ("zlib" ,zlib)))
    (arguments


@@ 123,7 123,7 @@ affine transformation (scale, rotation, shear, etc.)")
    `(("cairo" ,cairo)
      ("icu4c" ,icu4c)
      ("pkg-config" ,pkg-config)
      ("python" ,python)))
      ("python" ,python-wrapper)))
   (synopsis "opentype text shaping engine")
   (description
    "HarfBuzz is an OpenType text shaping engine.")

M gnu/packages/libevent.scm => gnu/packages/libevent.scm +1 -1
@@ 44,7 44,7 @@

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

M gnu/packages/netpbm.scm => gnu/packages/netpbm.scm +1 -1
@@ 57,7 57,7 @@
             ("libxml2" ,libxml2)
             ("perl" ,perl)
             ("pkg-config" ,pkg-config)
             ("python" ,python)
             ("python" ,python-wrapper)
             ("zlib" ,zlib)))
   (arguments
    `(#:phases

M gnu/packages/oggvorbis.scm => gnu/packages/oggvorbis.scm +1 -1
@@ 191,7 191,7 @@ meaning that audio is compressed in FLAC without any loss in quality.")
             ("libogg" ,libogg)
             ("libpng" ,libpng)
             ("pkg-config" ,pkg-config)
             ("python" ,python)
             ("python" ,python-wrapper)
             ("zlib" ,zlib)))
   (synopsis "kate, a karaoke and text codec for embedding in ogg")
   (description

M gnu/packages/qemu.scm => gnu/packages/qemu.scm +1 -1
@@ 94,7 94,7 @@
     `(;; ("mesa" ,mesa)
       ;; ("libaio" ,libaio)
       ("glib" ,glib)
       ("python" ,python)
       ("python" ,python-wrapper)
       ("ncurses" ,ncurses)
       ("libpng" ,libpng)
       ("libjpeg" ,libjpeg-8)

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

M gnu/packages/texlive.scm => gnu/packages/texlive.scm +2 -2
@@ 81,7 81,7 @@
             ("pkg-config" ,pkg-config)
             ;; FIXME: Add interpreters fontforge and ruby,
             ;; once they are available.
             ("python" ,python)
             ("python" ,python-wrapper)
             ("tcsh" ,tcsh)
             ("teckit" ,teckit)
             ("t1lib" ,t1lib)


@@ 202,7 202,7 @@ world.")
    (build-system gnu-build-system)
    (arguments '(#:tests? #f))                    ; no `check' target
    (inputs `(("texinfo" ,texinfo)
              ("python" ,python)
              ("python" ,python-wrapper)
              ("which" ,which)))
    (home-page "https://launchpad.net/rubber")
    (synopsis "Rubber, a wrapper for LaTeX and friends")

M gnu/packages/version-control.scm => gnu/packages/version-control.scm +1 -1
@@ 126,7 126,7 @@ everything from small to very large projects with speed and efficiency.")
      `(("apr" ,apr)
        ("apr-util" ,apr-util)
        ("perl" ,perl)
        ("python" ,python)
        ("python" ,python-wrapper)
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
    (home-page "http://subversion.apache.org/")

M gnu/packages/xml.scm => gnu/packages/xml.scm +2 -2
@@ 66,7 66,7 @@ things the parser might find in the XML document (like start tags).")
    (home-page "http://www.xmlsoft.org/")
    (synopsis "libxml2, a C parser for XML")
    (inputs `(("perl" ,perl)
              ("python" ,python)
              ("python" ,python-wrapper)
              ("zlib" ,zlib)))
    (arguments
     `(#:phases


@@ 102,7 102,7 @@ things the parser might find in the XML document (like start tags).")
    (synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents")
    (inputs `(("libgcrypt" ,libgcrypt)
              ("libxml2" ,libxml2)
              ("python" ,python)
              ("python" ,python-wrapper)
              ("zlib" ,zlib)))
    (description
     "Libxslt is an XSLT C library developed for the GNOME project. It is

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +4 -4
@@ 1857,7 1857,7 @@ tracking.")
            "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
    (build-system gnu-build-system)
    (inputs
      `(("pkg-config" ,pkg-config) ("python" ,python)))
      `(("pkg-config" ,pkg-config) ("python" ,python-wrapper)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")


@@ 4169,7 4169,7 @@ tracking.")
        ("libxml2" ,libxml2)
        ("makedepend" ,makedepend)
        ("pkg-config" ,pkg-config)
        ("python" ,python)))
        ("python" ,python-wrapper)))
    (arguments
      `(#:configure-flags
         `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm


@@ 4215,7 4215,7 @@ emulation to complete hardware acceleration for modern GPUs.")
      `(("xcb-proto" ,xcb-proto)
        ("libxslt" ,libxslt)
        ("pkg-config" ,pkg-config)
        ("python" ,python)))
        ("python" ,python-wrapper)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")


@@ 4270,7 4270,7 @@ emulation to complete hardware acceleration for modern GPUs.")
        ("mesa" ,mesa)
        ("openssl" ,openssl)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
        ("python" ,python-wrapper)
        ("recordproto" ,recordproto)
        ("resourceproto" ,resourceproto)
        ("scrnsaverproto" ,scrnsaverproto)

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

M gnu/packages/zip.scm => gnu/packages/zip.scm +1 -1
@@ 120,7 120,7 @@ UnZip recreates the stored directory structure by default.")
    (build-system gnu-build-system)
    (inputs `(("perl" ,perl)     ; for the documentation
              ("pkg-config" ,pkg-config)
              ("python" ,python) ; for the documentation
              ("python" ,python-wrapper) ; for the documentation
              ("zip" ,zip) ; to create test files
              ("zlib" ,zlib)))
    (arguments