Re: [PATCH] Add python-protobuf and python2-protobuf

[Daniel Pimentel <d4n1@d4n1.org>]

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

> Thanks for this! Can you try building the python-3 version as well, and
> then using package-with-python2 to make python2-protobuf?

Guix,

Patches to add python-protobuf to Python3 and Python2.

Thanks,

-- 
Daniel Pimentel (aka d4n1)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-Add-python2-protobuf.patch --]
[-- Type: text/x-diff; name=0003-gnu-Add-python2-protobuf.patch, Size: 1579 bytes --]

From 6584dd0d96fcef9e93c8285b074a9cf41c3d2efc Mon Sep 17 00:00:00 2001
From: Daniel Pimentel <d4n1@d4n1.org>
Date: Sun, 3 Jul 2016 15:45:17 -0300
Subject: [PATCH 3/4] gnu: Add python2-protobuf * gnu/packages/python.scm
 (python2-protobuf): New variables.

---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 529da2c..35fa16b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9342,3 +9342,30 @@ function PBKDF2.")
 Response (QR) images.  It is recommended that the pillow library be used to
 generate images, though the default Python imaging library can also be used.")
     (license bsd-3)))
+
+(define-public python2-protobuf
+  (package
+    (name "python2-protobuf")
+    (version "3.0.0b3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "protobuf" version))
+       (sha256
+        (base32
+         "098mnxzd3y67j44y3fdpfszphhljp88flfr4a90qfvvpy4ka7w5l"))))
+    (build-system python-build-system)
+    (inputs
+     `(("gcc" ,gcc)
+       ("zlib" ,zlib)
+       ("python2-six" ,python2-six)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://github.com/google/protobuf")
+    (synopsis "Protocol buffers is a data interchange format.")
+    (description
+     "Protocol buffers are a language-neutral, platform-neutral extensible 
+mechanism for serializing structured data.")
+    (license bsd-3)))
-- 
2.9.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0004-gnu-Add-python-protobuf-and-python2-protobuf.patch --]
[-- Type: text/x-diff; name=0004-gnu-Add-python-protobuf-and-python2-protobuf.patch, Size: 1862 bytes --]

From b5c6012f6d82e977a3eb968ce44e98e5a0a6d92f Mon Sep 17 00:00:00 2001
From: Daniel Pimentel <d4n1@d4n1.org>
Date: Thu, 14 Jul 2016 12:19:26 -0300
Subject: [PATCH 4/4] gnu: Add python-protobuf and python2-protobuf *
 gnu/packages/python.scm: Add python-protobuf and update python2-protobuf

---
 gnu/packages/python.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 35fa16b..c72126a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9343,9 +9343,9 @@ Response (QR) images.  It is recommended that the pillow library be used to
 generate images, though the default Python imaging library can also be used.")
     (license bsd-3)))
 
-(define-public python2-protobuf
+(define-public python-protobuf
   (package
-    (name "python2-protobuf")
+    (name "python-protobuf")
     (version "3.0.0b3")
     (source
      (origin
@@ -9358,14 +9358,16 @@ generate images, though the default Python imaging library can also be used.")
     (inputs
      `(("gcc" ,gcc)
        ("zlib" ,zlib)
-       ("python2-six" ,python2-six)))
-    (native-inputs
-     `(("python2-setuptools" ,python2-setuptools)))
-    (arguments
-     `(#:python ,python-2))
+       ("python-six" ,python-six)))
     (home-page "https://github.com/google/protobuf")
     (synopsis "Protocol buffers is a data interchange format.")
     (description
      "Protocol buffers are a language-neutral, platform-neutral extensible 
 mechanism for serializing structured data.")
     (license bsd-3)))
+
+(define-public python2-protobuf
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-protobuf)))
+           (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                            ("python2-six" ,python2-six)))))
-- 
2.9.0