Re: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu.

[Efraim Flashner]

On Thu, Mar 03, 2016 at 05:11:54PM -0500, Leo Famulari wrote:
> * gnu/packages/python.scm (python2-pyicu): Split variable into...
> (python-pyicu, python2-pyicu): ...both Python variants.
> (python-pyicu)[arguments]: Enable tests.
> ---

If we had the python- variant and were adding the python2- variant then
the message would be "add python2 variant," so I'd go with something
similar. Currently reading it I thought that there was already the
python and python2 variants, and there was a bigger split going on.

>  gnu/packages/python.scm | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index f168d15..b168183 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1133,9 +1133,9 @@ Python 3.3+.")
>    (package-with-python2 python-simplejson))
>  
>  
> -(define-public python2-pyicu
> +(define-public python-pyicu
>    (package
> -    (name "python2-pyicu")
> +    (name "python-pyicu")
>      (version "1.9.2")
>      (source
>       (origin
> @@ -1148,15 +1148,18 @@ Python 3.3+.")
>      (build-system python-build-system)
>      (inputs
>       `(("icu4c" ,icu4c)))
> -    (arguments
> -     `(#:python ,python-2 ; Python 3 works also, but needs special care for
> -                          ; linking with libpython3.3m

Whatever the magic that was needed, does it work?

> -       #:tests? #f)) ; no check target
>      (home-page "http://pyicu.osafoundation.org/";)
>      (synopsis "Python extension wrapping the ICU C++ API")
>      (description
>       "PyICU is a python extension wrapping the ICU C++ API.")
> -    (license x11)))
> +    (license x11)
> +    (properties `((python2-variant . ,(delay python2-pyicu))))))
> +
> +(define-public python2-pyicu
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-pyicu)))
> +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
>  
>  (define-public python2-dogtail
>    ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
> -- 
> 2.6.3
> 
> 

-- 
Efraim Flashner   <address@hidden>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

signature.asc
Description: PGP signature