me
/
guix
Archived
1
0
Fork 0

gnu: abseil-cpp: Update to 20210324.2.

But keep the older variant for Tensorflow.

* gnu/packages/cpp.scm (abseil-cpp-20200923.3): Renamed older variant.
(abseil-cpp): New variable.
* gnu/packages/machine-learning.scm (tensorflow-lite)
[inputs]: Adjust to use the older abseil-cpp-20200923.3.
* gnu/packages/rpc.scm (grpc-1.16.1)[native-inputs]: Likewise.

Co-authored-by: Greg Hogan <code@greghogan.com>
master
Maxim Cournoyer 2021-10-08 22:44:39 -04:00
parent d102bd7316
commit f0ce5a6051
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 29 additions and 6 deletions

View File

@ -765,7 +765,8 @@ other values of screen objects, by setting their values as the tween starting
point and then, after each tween step, plugging back the result.") point and then, after each tween step, plugging back the result.")
(license license:expat))) (license license:expat)))
(define-public abseil-cpp ;;; This older LTS release is kept for tensorflow.
(define-public abseil-cpp-20200923.3
(package (package
(name "abseil-cpp") (name "abseil-cpp")
(version "20200923.3") (version "20200923.3")
@ -812,6 +813,26 @@ augment the C++ standard library. The Abseil library code is collected from
Google's C++ code base.") Google's C++ code base.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public abseil-cpp
(let ((base abseil-cpp-20200923.3))
(package/inherit base
(name "abseil-cpp")
(version "20210324.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/abseil/abseil-cpp")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"))))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags)
`(cons* "-DBUILD_TESTING=ON"
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
(define-public pegtl (define-public pegtl
(package (package
(name "pegtl") (name "pegtl")

View File

@ -2211,7 +2211,7 @@ advanced research.")
(install-file file target-dir))) (install-file file target-dir)))
(find-files "." "\\.h$"))))))))) (find-files "." "\\.h$")))))))))
(inputs (inputs
`(("abseil-cpp" ,abseil-cpp) `(("abseil-cpp" ,abseil-cpp-20200923.3)
("eigen" ,eigen-for-tensorflow-lite) ("eigen" ,eigen-for-tensorflow-lite)
("flatbuffers" ,flatbuffers) ("flatbuffers" ,flatbuffers)
("python" ,python))) ("python" ,python)))

View File

@ -152,11 +152,13 @@ browsers to backend services.")
"src/core/lib/gpr/log_posix.cc" "src/core/lib/gpr/log_posix.cc"
"src/core/lib/iomgr/ev_epollex_linux.cc") "src/core/lib/iomgr/ev_epollex_linux.cc")
(("gettid\\(") (("gettid\\(")
"sys_gettid(")) "sys_gettid("))))))))
#t))))))
(native-inputs (native-inputs
`(("protobuf" ,protobuf-3.6) `(("abseil-cpp" ,abseil-cpp-20200923.3)
,@(alist-delete "protobuf" (package-native-inputs grpc)))))) ("protobuf" ,protobuf-3.6)
,@(fold alist-delete (package-native-inputs grpc)
'("abseil-cpp"
"protobuf"))))))
(define-public python-grpcio (define-public python-grpcio
(package (package