Commit 5e733d73 authored by Emily's avatar Emily
Browse files

abseil-cpp_202301: drop 

Only used by the broken TensorFlow source build.
parent ded7bc01

pkgs/development/libraries/abseil-cpp/202301.nix

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  gtest,

  static ? stdenv.hostPlatform.isStatic,

  cxxStandard ? null,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "abseil-cpp";

  version = "20230125.4";



  src = fetchFromGitHub {

    owner = "abseil";

    repo = "abseil-cpp";

    rev = "refs/tags/${finalAttrs.version}";

    hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U=";

  };



  patches = [

    # Fixes: clang++: error: unsupported option '-msse4.1' for target 'aarch64-apple-darwin'

    # https://github.com/abseil/abseil-cpp/pull/1707

    (fetchpatch {

      name = "fix-compile-breakage-on-darwin";

      url = "https://github.com/abseil/abseil-cpp/commit/6dee153242d7becebe026a9bed52f4114441719d.patch";

      hash = "sha256-r6QnHPnwPwOE/hv4kLNA3FqNq2vU/QGmwAc5q0/q1cs=";

    })

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages

    # that require a different SDK other than the default one.

    ./cmake-core-foundation.patch

  ];



  cmakeFlags = [

    "-DABSL_BUILD_TEST_HELPERS=ON"

    "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"

    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"

  ]

  ++ lib.optionals (cxxStandard != null) [

    "-DCMAKE_CXX_STANDARD=${cxxStandard}"

  ];



  strictDeps = true;



  nativeBuildInputs = [ cmake ];



  buildInputs = [ gtest ];



  meta = with lib; {

    description = "Open-source collection of C++ code designed to augment the C++ standard library";

    homepage = "https://abseil.io/";

    license = licenses.asl20;

    platforms = platforms.all;

    maintainers = [ maintainers.andersk ];

    # Requires LFS64 APIs. 202401 and later are fine.

    broken = stdenv.hostPlatform.isMusl;

  };

})

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ mapAliases { 


  AusweisApp2 = ausweisapp; # Added 2023-11-08

  a4term = a4; # Added 2023-10-06

  abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09

  acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27

  acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04

  adminer-pematon = adminneo; # Added 2025-02-20

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -7471,7 +7471,6 @@ with pkgs; 
  ### DEVELOPMENT / LIBRARIES



  abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { };

  abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { };

  abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix { };

  abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix { };

  abseil-cpp = abseil-cpp_202501;

pkgs/top-level/python-packages.nix

+3 −2
Original line number Diff line number Diff line
@@ -17884,7 +17884,8 @@ self: super: with self; { 
  tensorflow-build =

    let

      compat = rec {

        protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; };

        #protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; };

        protobufTF = pkgs.protobuf;

        # https://www.tensorflow.org/install/source#gpu

        #cudaPackagesTF = pkgs.cudaPackages_11;

        cudaPackagesTF = pkgs.cudaPackages;
@@ -17926,7 +17927,7 @@ self: super: with self; { 
      grpc = compat.grpcTF;

      grpcio = compat.grpcioTF;

      tensorboard = compat.tensorboardTF;

      abseil-cpp = pkgs.abseil-cpp_202301;

      #abseil-cpp = pkgs.abseil-cpp_202301;

      snappy-cpp = pkgs.snappy;















      # Tensorflow 2.13 doesn't support gcc13: