Browse Source

gnu: protobuf: Update to 3.10.0.

* gnu/packages/protobuf.scm (protobuf, python-protobuf): Update to 3.10.0.
(protobuf-next, python-protobuf-next): Rename to ....
(protobuf-3.6, python-protobuf-3.6): ... this.
(protobuf-3.5): New public variable.
* gnu/packages/machine-learning.scm (grpc)[native-inputs]: Change from
PROTOBUF-NEXT to PROTOBUF.
(tensorflow)[native-inputs, propagated-inputs]: Adjust for renamed PROTOBUF-NEXT.
* gnu/packages/robotics.scm (aseba)[inputs]: Change from PROTOBUF to PROTOBUF-3.5.
* gnu/packages/telephony.scm (mumble)[inputs]: Likewise.
gn-latest-20200428
Marius Bakke 2 years ago
parent
commit
7373eb8304
No known key found for this signature in database GPG Key ID: A2A06DF2A33A54FA
4 changed files with 32 additions and 17 deletions
  1. +5
    -5
      gnu/packages/machine-learning.scm
  2. +25
    -10
      gnu/packages/protobuf.scm
  3. +1
    -1
      gnu/packages/robotics.scm
  4. +1
    -1
      gnu/packages/telephony.scm

+ 5
- 5
gnu/packages/machine-learning.scm View File

@ -1302,7 +1302,7 @@ Python.")
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
`(("protobuf" ,protobuf-next)
`(("protobuf" ,protobuf)
("python" ,python-wrapper)))
(home-page "https://grpc.io")
(synopsis "High performance universal RPC framework")
@ -1607,8 +1607,8 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
#t))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("protobuf:native" ,protobuf-next) ; protoc
("protobuf:src" ,(package-source protobuf-next))
("protobuf:native" ,protobuf-3.6) ; protoc
("protobuf:src" ,(package-source protobuf-3.6))
("eigen:src" ,(package-source eigen-for-tensorflow))
;; install_pip_packages.sh wants setuptools 39.1.0 specifically.
("python-setuptools" ,python-setuptools-for-tensorflow)
@ -1735,7 +1735,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
("python-gast" ,python-gast)
("python-grpcio" ,python-grpcio)
("python-numpy" ,python-numpy)
("python-protobuf" ,python-protobuf-next)
("python-protobuf" ,python-protobuf-3.6)
("python-six" ,python-six)
("python-termcolo" ,python-termcolor)
("python-wheel" ,python-wheel)))
@ -1751,7 +1751,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
("jsoncpp" ,jsoncpp-for-tensorflow)
("snappy" ,snappy)
("sqlite" ,sqlite)
("protobuf" ,protobuf-next)
("protobuf" ,protobuf-3.6)
("python" ,python-wrapper)
("zlib" ,zlib)))
(home-page "https://tensorflow.org")


+ 25
- 10
gnu/packages/protobuf.scm View File

@ -75,7 +75,7 @@ data in motion, or as a file format for data at rest.")
(define-public protobuf
(package
(name "protobuf")
(version "3.5.1")
(version "3.10.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/google/protobuf/releases/"
@ -83,7 +83,7 @@ data in motion, or as a file format for data at rest.")
version ".tar.gz"))
(sha256
(base32
"14j0427ykjzrd9a66c2mpk0sjcccjlsx6q8ww6hzwb6sha3vm3f2"))))
"06xnqpsa79jrk3k55fsycnp7jac546299v7gdyx9yf4c5q81xfgz"))))
(build-system gnu-build-system)
(inputs `(("zlib" ,zlib)))
(outputs (list "out"
@ -112,9 +112,9 @@ yet extensible format. Google uses Protocol Buffers for almost all of its
internal RPC protocols and file formats.")
(license license:bsd-3)))
(define-public protobuf-next
(package (inherit protobuf)
(name "protobuf")
;; Tensorflow requires version 3.6 specifically.
(define-public protobuf-3.6
(package/inherit protobuf
(version "3.6.1")
(source (origin
(method url-fetch)
@ -125,6 +125,20 @@ internal RPC protocols and file formats.")
(base32
"0a955bz59ihrb5wg7dwi12xajdi5pmz4bl0g147rbdwv393jwwxk"))))))
;; The 3.5 series are the last versions that do not require C++ 11.
(define-public protobuf-3.5
(package/inherit
protobuf
(version "3.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/google/protobuf/releases/"
"download/v" version "/protobuf-cpp-"
version ".tar.gz"))
(sha256
(base32
"14j0427ykjzrd9a66c2mpk0sjcccjlsx6q8ww6hzwb6sha3vm3f2"))))))
;; XXX Remove this old version when no other packages depend on it.
(define-public protobuf-2
(package (inherit protobuf)
@ -189,14 +203,14 @@ encoder in C++. The developer using protozero has to manually translate the
(define-public python-protobuf
(package
(name "python-protobuf")
(version "3.5.2")
(version "3.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "protobuf" version))
(sha256
(base32
"1q4b1m55w4gvcbzklbk8iylaii98n4in41k27d94w8ypbwlrm1q9"))))
"1zjq3qi0wgqi0fwxgqlgwvj9ri1m4kmnz3jnpd803lqc5k0vb0yv"))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)))
@ -210,10 +224,11 @@ mechanism for serializing structured data.")
(define-public python2-protobuf
(package-with-python2 python-protobuf))
(define-public python-protobuf-next
(package (inherit python-protobuf)
;; For tensorflow.
(define-public python-protobuf-3.6
(package/inherit python-protobuf
(name "python-protobuf")
(version (package-version protobuf-next) )
(version (package-version protobuf-3.6) )
(source
(origin
(method url-fetch)


+ 1
- 1
gnu/packages/robotics.scm View File

@ -106,7 +106,7 @@ hundred times faster than real-time.")
(inputs
`(("dashel" ,dashel)
("enki" ,enki)
("protobuf" ,protobuf) ;for logging
("protobuf" ,protobuf-3.5) ;for logging
("qtbase" ,qtbase)
("qtsvg" ,qtsvg)
("qttools" ,qttools) ;for libQt5Help, needed by "studio"


+ 1
- 1
gnu/packages/telephony.scm View File

@ -464,7 +464,7 @@ address of one of the participants.")
(find-files "release/plugins" "\\.so$"))))))))
(inputs
`(("avahi" ,avahi)
("protobuf" ,protobuf)
("protobuf" ,protobuf-3.5)
("openssl" ,openssl)
("libsndfile" ,libsndfile)
("boost" ,boost)


Loading…
Cancel
Save