From 6bc5bf199a2ffb6e4c2b15b22ec6a3af75df4953 Mon Sep 17 00:00:00 2001 From: Tomas Drtina Date: Tue, 6 Jun 2023 18:33:09 +0200 Subject: [PATCH] abseil-cpp: default to 202301 Packages that depend on default version were pinned back to avoid rebuilds. This should be fixed in future PR or commit --- pkgs/servers/redpanda/server.nix | 4 ++-- pkgs/top-level/all-packages.nix | 22 ++++++++++++++++------ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix index 9cb050eb5f45..fc6068a2d6ab 100644 --- a/pkgs/servers/redpanda/server.nix +++ b/pkgs/servers/redpanda/server.nix @@ -1,4 +1,4 @@ -{ abseil-cpp +{ abseil-cpp_202103 , avro-cpp , callPackage , ccache @@ -91,7 +91,7 @@ llvmPackages_14.stdenv.mkDerivation rec { ]; buildInputs = [ - abseil-cpp + abseil-cpp_202103 avro-cpp base64 crc32c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31958f0e3975..e2b7f4cd3ad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4044,7 +4044,9 @@ with pkgs; cudaSupport = config.cudaSupport or false; }; - tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; + tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { + abseil-cpp = abseil-cpp_202103; + }; tiny-cuda-nn = callPackage ../development/libraries/science/math/tiny-cuda-nn { }; @@ -7558,7 +7560,7 @@ with pkgs; fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { - abseil-cpp = abseil-cpp.override { + abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; }; }; @@ -19770,6 +19772,7 @@ with pkgs; ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; + abseil-cpp = abseil-cpp_202103; }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -19802,7 +19805,7 @@ with pkgs; abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { }; - abseil-cpp = abseil-cpp_202103; + abseil-cpp = abseil-cpp_202301; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -23801,9 +23804,15 @@ with pkgs; protobuf = protobuf3_21; - protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; - protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; - protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; + protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { + abseil-cpp = abseil-cpp_202103; + }; + protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { + abseil-cpp = abseil-cpp_202103; + }; + protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { + abseil-cpp = abseil-cpp_202103; + }; protobufc = callPackage ../development/libraries/protobufc { }; @@ -32414,6 +32423,7 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + abseil-cpp = abseil-cpp_202103; }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c260b693c24..d76410f5a509 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2920,7 +2920,7 @@ self: super: with self; { dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; dm-tree = callPackage ../development/python-modules/dm-tree { - abseil-cpp = pkgs.abseil-cpp.override { + abseil-cpp = pkgs.abseil-cpp_202103.override { cxxStandard = "14"; }; };