Commit fb236b37 authored by Florian Klink's avatar Florian Klink
Browse files

Revert "abseil-cpp_202505: drop" 

This reverts commit 7559006e.

It is needed for the current or-tools release, 9.14:

https://github.com/google/or-tools/blob/93dafb79a0261b5211f4eb17437aeebd7f45e543/MODULE.bazel#L16
parent 4a0ac980

pkgs/by-name/ab/abseil-cpp_202505/package.nix

0 → 100644
+45 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  gtest,

  static ? stdenv.hostPlatform.isStatic,

  cxxStandard ? null,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "abseil-cpp";

  version = "20250512.1";



  src = fetchFromGitHub {

    owner = "abseil";

    repo = "abseil-cpp";

    tag = finalAttrs.version;

    hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";

  };



  cmakeFlags = [

    (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true)

    (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true)

    (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))

  ]

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

    (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard)

  ];



  strictDeps = true;



  nativeBuildInputs = [ cmake ];



  buildInputs = [ gtest ];



  meta = {

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

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

    changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}";

    license = lib.licenses.asl20;

    platforms = lib.platforms.all;

    maintainers = [ lib.maintainers.GaetanLepage ];

  };

})

pkgs/top-level/aliases.nix

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ mapAliases { 
  a4term = throw "'a4term' has been renamed to/replaced by 'a4'"; # Converted to throw 2025-10-27

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

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

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

  adminer-pematon = throw "'adminer-pematon' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27

  adminerneo = throw "'adminerneo' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27

  adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31