[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/22: gnu: abseil-cpp: Update to 20210324.2.
From: |
guix-commits |
Subject: |
05/22: gnu: abseil-cpp: Update to 20210324.2. |
Date: |
Sun, 10 Oct 2021 00:53:33 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 302a9111df6bfbe39d6687f1d428dc9028675d80
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 8 22:44:39 2021 -0400
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>
---
gnu/packages/cpp.scm | 23 ++++++++++++++++++++++-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/rpc.scm | 10 ++++++----
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 207129c..dce137a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -741,7 +741,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.")
(license license:expat)))
-(define-public abseil-cpp
+;;; This older LTS release is kept for tensorflow.
+(define-public abseil-cpp-20200923.3
(package
(name "abseil-cpp")
(version "20200923.3")
@@ -788,6 +789,26 @@ augment the C++ standard library. The Abseil library code
is collected from
Google's C++ code base.")
(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
(package
(name "pegtl")
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 0294226..d709120 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -2239,7 +2239,7 @@ advanced research.")
(install-file file target-dir)))
(find-files "." "\\.h$")))))))))
(inputs
- `(("abseil-cpp" ,abseil-cpp)
+ `(("abseil-cpp" ,abseil-cpp-20200923.3)
("eigen" ,eigen-for-tensorflow-lite)
("flatbuffers" ,flatbuffers)
("python" ,python)))
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index f02fa66..0ff8363 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -152,11 +152,13 @@ browsers to backend services.")
"src/core/lib/gpr/log_posix.cc"
"src/core/lib/iomgr/ev_epollex_linux.cc")
(("gettid\\(")
- "sys_gettid("))
- #t))))))
+ "sys_gettid("))))))))
(native-inputs
- `(("protobuf" ,protobuf-3.6)
- ,@(alist-delete "protobuf" (package-native-inputs grpc))))))
+ `(("abseil-cpp" ,abseil-cpp-20200923.3)
+ ("protobuf" ,protobuf-3.6)
+ ,@(fold alist-delete (package-native-inputs grpc)
+ '("abseil-cpp"
+ "protobuf"))))))
(define-public python-grpcio
(package
- 07/22: gnu: Add a missing copyright., (continued)
- 07/22: gnu: Add a missing copyright., guix-commits, 2021/10/10
- 08/22: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/10
- 15/22: gnu: gst-libav: Update to 1.18.5., guix-commits, 2021/10/10
- 11/22: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/10
- 09/22: Revert gstreamer update to 1.19.2., guix-commits, 2021/10/10
- 16/22: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/10
- 17/22: gnu: python-gst: Update to 1.18.5., guix-commits, 2021/10/10
- 14/22: gnu: gst-plugins-ugly: Update to 1.18.5., guix-commits, 2021/10/10
- 19/22: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/10
- 10/22: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/10
- 05/22: gnu: abseil-cpp: Update to 20210324.2.,
guix-commits <=
- 13/22: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/10
- 22/22: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/10
- 21/22: gnu: dbus-c++: Fix build., guix-commits, 2021/10/10
- 12/22: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/10
- 18/22: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/10
- 20/22: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/10