summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-02-27 23:53:57 +0100
committerAndreas Enge <andreas@enge.fr>2015-02-27 23:53:57 +0100
commit7ca0dbc3f063ef26c6eff87ec9661eab84af5c85 (patch)
treeea664e8aedbee98ed633fa9e3b307e8422fe7636
parentac4cbcc10ac20e31abbc40e68e11baad320b24b4 (diff)
gnu: python2-py2cairo: Rename to python2-pycairo.
* gnu/packages/gtk.scm (python2-py2cairo): Rename to ... (python2-pycairo): ... this (python2-pygtk): Adapt input. * gnu/packages/glib.scm (python2-pygobject-2): Adapt input. * gnu/packages/python.scm (package-with-python2): Adapt input.
-rw-r--r--gnu/packages/glib.scm6
-rw-r--r--gnu/packages/gtk.scm8
-rw-r--r--gnu/packages/python.scm2
3 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 66ee4fae97..a2c01e6440 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -212,11 +212,11 @@ dynamic loading, and an object system.")
"/gobject-introspection-" version ".tar.xz"))
(sha256
(base32 "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv"))
- (patches (list
+ (patches (list
(search-patch "gobject-introspection-cc.patch")
(search-patch
"gobject-introspection-girepository.patch")
- (search-patch
+ (search-patch
"gobject-introspection-absolute-shlib-path.patch")))))
(build-system gnu-build-system)
(inputs
@@ -466,7 +466,7 @@ useful for C++.")
(inputs
`(("python" ,python-2)
("glib" ,glib)
- ("python2-py2cairo" ,python2-py2cairo)
+ ("python2-pycairo" ,python2-pycairo)
("gobject-introspection" ,gobject-introspection)))
(propagated-inputs
`(("libffi" ,libffi))) ;mentioned in pygobject-2.0.pc
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a5022ba116..81f912e4dc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -532,7 +532,7 @@ graphics library with all of the benefits of Scheme: memory management,
exceptions, macros, and a dynamic programming environment.")
(license license:lgpl3+)))
-
+
;;;
;;; C++ bindings.
;;;
@@ -705,9 +705,9 @@ extensive documentation, including API reference and a tutorial.")
"Pycairo is a set of Python bindings for the Cairo graphics library.")
(license license:lgpl3+)))
-(define-public python2-py2cairo
+(define-public python2-pycairo
(package (inherit python-pycairo)
- (name "python2-py2cairo")
+ (name "python2-pycairo")
(version "1.10.0")
(source
(origin
@@ -743,7 +743,7 @@ extensive documentation, including API reference and a tutorial.")
`(("python" ,python-2)
("glib" ,glib)))
(propagated-inputs
- `(("python-pycairo" ,python2-py2cairo) ;loaded at runtime
+ `(("python-pycairo" ,python2-pycairo) ;loaded at runtime
("python-pygobject" ,python2-pygobject-2) ;referenced in pc file
("gtk+" ,gtk+-2)))
(arguments
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index bbff241833..014e592203 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2290,7 +2290,7 @@ toolkits.")
;; Make sure we use exactly PYTHON2-NUMPYDOC, which is
;; customized for Python 2.
(propagated-inputs
- `(("python2-py2cairo" ,python2-py2cairo)
+ `(("python2-pycairo" ,python2-pycairo)
("python2-pygobject-2" ,python2-pygobject-2)
,@(alist-delete "python-pycairo"
(alist-delete "python-pygobject"