guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

25/103: gnu: Fix python inputs, part 7: Ensure python-cython is a native


From: Hartmut Goebel
Subject: 25/103: gnu: Fix python inputs, part 7: Ensure python-cython is a native-input.
Date: Tue, 25 Oct 2016 17:44:39 +0000 (UTC)

htgoebel pushed a commit to branch wip-python-build-system
in repository guix.

commit b13beba9ad96c0518e80c5ac794ac68ab3ad060a
Author: Hartmut Goebel <address@hidden>
Date:   Thu Oct 13 14:33:55 2016 +0200

    gnu: Fix python inputs, part 7: Ensure python-cython is a native-input.
    
    * gnu/packages/audio.scm (python-pyliblo): [inputs] Move python-cyton to
      [native-inputs].
    * gnu/packages/bioinformatics.scm (python2-pybedtools): dito.
    * gnu/packages/music.scm (beast, python-pyportmidi): dito.
    * gnu/packages/python.scm (python2-fastlmm, python-kivy): dito.
---
 gnu/packages/audio.scm          |    5 +++--
 gnu/packages/bioinformatics.scm |    6 +++---
 gnu/packages/music.scm          |    8 ++++----
 gnu/packages/python.scm         |    6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e6670fa..8a5e5e6 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1355,9 +1355,10 @@ implementation of the Open Sound Control (OSC) 
protocol.")
                "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"))))
     (build-system python-build-system)
     (arguments `(#:tests? #f)) ;no tests
+    (native-inputs
+     `(("python-cython" ,python-cython)))
     (inputs
-     `(("python-cython" ,python-cython)
-       ("liblo" ,liblo)))
+     `(("liblo" ,liblo)))
     (home-page "http://das.nasophon.de/pyliblo/";)
     (synopsis "Python bindings for liblo")
     (description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 37ed5cd..8dabf38 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -522,13 +522,13 @@ intended to behave exactly the same as the original BWK 
awk.")
     (build-system python-build-system)
     (arguments `(#:python ,python-2)) ; no Python 3 support
     (inputs
-     `(("python-cython" ,python2-cython)
-       ("python-matplotlib" ,python2-matplotlib)))
+     `(("python-matplotlib" ,python2-matplotlib)))
     (propagated-inputs
      `(("bedtools" ,bedtools)
        ("samtools" ,samtools)))
     (native-inputs
-     `(("python-pyyaml" ,python2-pyyaml)
+     `(("python-cython" ,python2-cython)
+       ("python-pyyaml" ,python2-pyyaml)
        ("python-nose" ,python2-nose)))
     (home-page "https://pythonhosted.org/pybedtools/";)
     (synopsis "Python wrapper for BEDtools programs")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 668bf39..0a42634 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1022,7 +1022,6 @@ Laurens Hammond and Don Leslie.")
      `(("rapicorn" ,rapicorn)
        ("guile" ,guile-1.8)
        ("python" ,python-2)
-       ("cython" ,python2-cython)
        ("libgnomecanvas" ,libgnomecanvas)
        ("libogg" ,libogg)
        ("libmad" ,libmad)
@@ -1033,6 +1032,7 @@ Laurens Hammond and Don Leslie.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("glib:bin" ,glib "bin")
+       ("cython" ,python2-cython)
        ("perl" ,perl)
        ("perl-xml-parser" ,perl-xml-parser)))
     (home-page "https://testbit.eu/wiki/Beast_Home";)
@@ -1315,10 +1315,10 @@ using a system-independent interface.")
              #t)))))
     (inputs
      `(("portmidi" ,portmidi)
-       ("alsa-lib" ,alsa-lib)
-       ("python-cython" ,python-cython)))
+       ("alsa-lib" ,alsa-lib)))
     (native-inputs
-     `(("unzip" ,unzip)))
+     `(("python-cython" ,python-cython)
+       ("unzip" ,unzip)))
     (home-page "http://portmedia.sourceforge.net/portmidi/";)
     (synopsis "Python bindings to PortMidi")
     (description
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 90c50d1..6b603a4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9776,10 +9776,10 @@ and/or Xon/Xoff.  The port is accessed in RAW mode.")
                                     "/include/SDL2"))
              #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("python-cython" ,python-cython)))
     (inputs
-     `(("python-cython" ,python-cython)
-       ("gstreamer" ,gstreamer)
+     `(("gstreamer" ,gstreamer)
        ("mesa" ,mesa)
        ("sdl-union"
         ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]