diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/protobuf.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/protobuf.scm')
| -rw-r--r-- | gnu/packages/protobuf.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 36919663e3..405b83efee 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -123,7 +123,8 @@ internal RPC protocols and file formats.") ;; Tensorflow requires version 3.6 specifically. (define-public protobuf-3.6 - (package/inherit protobuf + (package + (inherit protobuf) (version "3.6.1") (source (origin (method url-fetch) @@ -136,8 +137,8 @@ internal RPC protocols and file formats.") ;; The 3.5 series are the last versions that do not require C++ 11. (define-public protobuf-3.5 - (package/inherit - protobuf + (package + (inherit protobuf) (version "3.5.1") (source (origin (method url-fetch) @@ -276,7 +277,8 @@ structured data.") ;; For tensorflow. (define-public python-protobuf-3.6 - (package/inherit python-protobuf + (package + (inherit python-protobuf) (name "python-protobuf") (version (package-version protobuf-3.6) ) (source |