[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/130: gnu: abseil-cpp: Update to 20210324.2.
From: |
guix-commits |
Subject: |
55/130: gnu: abseil-cpp: Update to 20210324.2. |
Date: |
Sat, 16 Oct 2021 02:36:27 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 84f84d6e7c6821f9853bf63d3242cb2ed0ed0de8
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 0f56c50..3a9528d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -744,7 +744,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")
@@ -791,6 +792,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 9362d74..d714280 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -2211,7 +2211,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
- 103/130: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., (continued)
- 103/130: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/16
- 109/130: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 112/130: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/16
- 111/130: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/16
- 119/130: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/16
- 122/130: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/16
- 117/130: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/16
- 26/130: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/16
- 48/130: gnu: python-gst: Update to 1.19.2., guix-commits, 2021/10/16
- 51/130: gnu: pulseaudio: Update to 15.0., guix-commits, 2021/10/16
- 55/130: gnu: abseil-cpp: Update to 20210324.2.,
guix-commits <=
- 56/130: gnu: mozjs-78: Update to 78.13.0., guix-commits, 2021/10/16
- 60/130: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/16
- 62/130: gnu: gst-plugins-good: Update to 1.18.5., guix-commits, 2021/10/16
- 71/130: gnu: dbus-c++: Fix build., guix-commits, 2021/10/16
- 72/130: gnu: libnice: Update to 0.1.18-0.47a9633., guix-commits, 2021/10/16
- 76/130: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/16
- 83/130: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/16
- 92/130: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/16
- 102/130: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/16
- 110/130: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/16