From c36784ca3e6bbf2f8a1a158f2966f2d85ab6a0d5 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 17 Sep 2025 04:36:18 +0100 Subject: [PATCH] easyloggingpp: drop Deprecated upstream. Only used by `encfs`, which is also deprecated, and vendors a newer version anyway. Will be broken by CMake 4. --- pkgs/by-name/ea/easyloggingpp/package.nix | 36 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/by-name/ea/easyloggingpp/package.nix diff --git a/pkgs/by-name/ea/easyloggingpp/package.nix b/pkgs/by-name/ea/easyloggingpp/package.nix deleted file mode 100644 index 8aa369284f6f..000000000000 --- a/pkgs/by-name/ea/easyloggingpp/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -# To use this package with a CMake and pkg-config build: -# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) -# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - gtest, -}: -stdenv.mkDerivation rec { - pname = "easyloggingpp"; - version = "9.97.1"; - src = fetchFromGitHub { - owner = "amrayn"; - repo = "easyloggingpp"; - rev = "v${version}"; - sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ gtest ]; - cmakeFlags = [ "-Dtest=ON" ]; - env.NIX_CFLAGS_COMPILE = "-std=c++14" + lib.optionalString stdenv.hostPlatform.isLinux " -pthread"; - postInstall = '' - mkdir -p $out/include - cp ../src/easylogging++.cc $out/include - ''; - meta = { - description = "C++ logging library"; - homepage = "https://github.com/amrayn/easyloggingpp"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ acowley ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d903ac3ed8b..dbe7353e97df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { EBTKS = ebtks; # Added 2024-01-21 eask = eask-cli; # Added 2024-09-05 + easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19 ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17 ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17