[PATCH 3/18] gnu: Add python2-apipkg.

[PATCH 3/18] gnu: Add python2-apipkg.

[Christopher Allan Webber]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0003-gnu-Add-python2-apipkg.patch --]
[-- Type: text/x-patch, Size: 1146 bytes --]

From 68a12b91238427d68767ca3a5a4adda36298274c Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 13 Feb 2016 18:04:18 -0800
Subject: [PATCH 03/18] gnu: Add python2-apipkg.

* gnu/packages/python.scm (python2-apipkg): New variable.
---
 gnu/packages/python.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7b794d1..83efbfb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6855,7 +6855,15 @@ applications.")
 package and greatly reduce the number of imports for your users.  It is a small
 pure Python module that works on virtually all Python versions.")
     (home-page "https://bitbucket.org/hpk42/apipkg")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-apipkg))))))
+
+(define-public python2-apipkg
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-apipkg)))
+    (inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python-execnet
   (package
-- 
2.6.3

Re: [PATCH 3/18] gnu: Add python2-apipkg.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:27:01PM -0800, Christopher Allan Webber wrote:
> From 68a12b91238427d68767ca3a5a4adda36298274c Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber <cwebber@dustycloud.org>
> Date: Sat, 13 Feb 2016 18:04:18 -0800
> Subject: [PATCH 03/18] gnu: Add python2-apipkg.
> 
> * gnu/packages/python.scm (python2-apipkg): New variable.
> ---
>  gnu/packages/python.scm | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7b794d1..83efbfb 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -6855,7 +6855,15 @@ applications.")
>  package and greatly reduce the number of imports for your users.  It is a small
>  pure Python module that works on virtually all Python versions.")
>      (home-page "https://bitbucket.org/hpk42/apipkg")
> -    (license license:expat)))
> +    (license license:expat)
> +    (properties `((python2-variant . ,(delay python2-apipkg))))))
> +
> +(define-public python2-apipkg
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-apipkg)))
> +    (inputs
> +     `(("python2-setuptools" ,python2-setuptools)))))
>  

Thanks for making this python2-variant (and any others I may have left
out). I left it out when I added python-apipkg since we didn't have this
solution yet.

>  (define-public python-execnet
>    (package
> -- 
> 2.6.3
> 
> 

Re: [PATCH 3/18] gnu: Add python2-apipkg.

[Christopher Allan Webber]

[-- Attachment #1: Type: text/plain, Size: 14 bytes --]

New version.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-python2-apipkg.patch --]
[-- Type: text/x-diff, Size: 1154 bytes --]

From 03f8891a2635b6d8f349af0809547e75b9c0e112 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 13 Feb 2016 18:04:18 -0800
Subject: [PATCH 02/18] gnu: Add python2-apipkg.

* gnu/packages/python.scm (python2-apipkg): New variable.
---
 gnu/packages/python.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 561f64a..ef91754 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6852,7 +6852,15 @@ applications.")
 package and greatly reduce the number of imports for your users.  It is a small
 pure Python module that works on virtually all Python versions.")
     (home-page "https://bitbucket.org/hpk42/apipkg")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-apipkg))))))
+
+(define-public python2-apipkg
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-apipkg)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python-execnet
   (package
-- 
2.6.3

Re: [PATCH 3/18] gnu: Add python2-apipkg.

[Leo Famulari]

On Fri, Feb 19, 2016 at 06:30:35PM -0800, Christopher Allan Webber wrote:
> New version.
> 

> From 03f8891a2635b6d8f349af0809547e75b9c0e112 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber <cwebber@dustycloud.org>
> Date: Sat, 13 Feb 2016 18:04:18 -0800
> Subject: [PATCH 02/18] gnu: Add python2-apipkg.
> 
> * gnu/packages/python.scm (python2-apipkg): New variable.
> ---
>  gnu/packages/python.scm | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 561f64a..ef91754 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -6852,7 +6852,15 @@ applications.")
>  package and greatly reduce the number of imports for your users.  It is a small
>  pure Python module that works on virtually all Python versions.")
>      (home-page "https://bitbucket.org/hpk42/apipkg")
> -    (license license:expat)))
> +    (license license:expat)
> +    (properties `((python2-variant . ,(delay python2-apipkg))))))
> +
> +(define-public python2-apipkg
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-apipkg)))
> +    (native-inputs
> +     `(("python2-setuptools" ,python2-setuptools)))))

I noticed that python-apipkg uses unzip as a native-input, so this
variant would lose unzip. I tested it python-apipkg and it doesn't
*actually* need unzip to build... not sure why I thought it did. Would
you mind removing unzip from python-apipkg?

>  
>  (define-public python-execnet
>    (package
> -- 
> 2.6.3
> 

Re: [PATCH 3/18] gnu: Add python2-apipkg.

[Christopher Allan Webber]

Leo Famulari writes:

> On Fri, Feb 19, 2016 at 06:30:35PM -0800, Christopher Allan Webber wrote:
>> New version.
>> 
>
>> From 03f8891a2635b6d8f349af0809547e75b9c0e112 Mon Sep 17 00:00:00 2001
>> From: Christopher Allan Webber <cwebber@dustycloud.org>
>> Date: Sat, 13 Feb 2016 18:04:18 -0800
>> Subject: [PATCH 02/18] gnu: Add python2-apipkg.
>> 
>> * gnu/packages/python.scm (python2-apipkg): New variable.
>> ---
>>  gnu/packages/python.scm | 10 +++++++++-
>>  1 file changed, 9 insertions(+), 1 deletion(-)
>> 
>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
>> index 561f64a..ef91754 100644
>> --- a/gnu/packages/python.scm
>> +++ b/gnu/packages/python.scm
>> @@ -6852,7 +6852,15 @@ applications.")
>>  package and greatly reduce the number of imports for your users.  It is a small
>>  pure Python module that works on virtually all Python versions.")
>>      (home-page "https://bitbucket.org/hpk42/apipkg")
>> -    (license license:expat)))
>> +    (license license:expat)
>> +    (properties `((python2-variant . ,(delay python2-apipkg))))))
>> +
>> +(define-public python2-apipkg
>> +  (package
>> +    (inherit (package-with-python2
>> +              (strip-python2-variant python-apipkg)))
>> +    (native-inputs
>> +     `(("python2-setuptools" ,python2-setuptools)))))
>
> I noticed that python-apipkg uses unzip as a native-input, so this
> variant would lose unzip. I tested it python-apipkg and it doesn't
> *actually* need unzip to build... not sure why I thought it did. Would
> you mind removing unzip from python-apipkg?

Sure, though I think that's a separate commit.  I've verified it works
locally, and will push with the wip-mediagoblin changes.