From 579296ff47fbdc0951903b793c37f16eeb978150 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 22 Mar 2023 18:55:15 +0100 Subject: [PATCH] spdlog_0: remove unused package --- pkgs/development/libraries/spdlog/default.nix | 101 ++++++++---------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 43 insertions(+), 63 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index b77eb935d4e6..a53860478b32 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,67 +2,50 @@ , staticBuild ? stdenv.hostPlatform.isStatic }: -let - generic = { version, sha256 }: - stdenv.mkDerivation { - pname = "spdlog"; - inherit version; +stdenv.mkDerivation rec { + pname = "spdlog"; + version = "1.10.0"; - src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - inherit sha256; - }; - - # in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380 - patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch"; - sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q"; - }); - - nativeBuildInputs = [ cmake ]; - # spdlog <1.3 uses a bundled version of fmt - propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; - - cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" - "-DSPDLOG_BUILD_EXAMPLE=OFF" - "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_TESTS=ON" - "-DSPDLOG_FMT_EXTERNAL=ON" - ]; - - outputs = [ "out" "doc" ] - # spdlog <1.4 is header only, no need to split libraries and headers - ++ lib.optional (lib.versionAtLeast version "1.4") "dev"; - - postInstall = '' - mkdir -p $out/share/doc/spdlog - cp -rv ../example $out/share/doc/spdlog - ''; - - doCheck = true; - - meta = with lib; { - description = "Very fast, header only, C++ logging library"; - homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; - }; -in -{ - spdlog_1 = generic { - version = "1.10.0"; - sha256 = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws="; + src = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + rev = "v${version}"; + hash = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws="; }; - spdlog_0 = generic { - version = "0.17.0"; - sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9"; + # in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380 + patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch"; + sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q"; + }); + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ fmt_8 ]; + + cmakeFlags = [ + "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" + "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" + "-DSPDLOG_BUILD_EXAMPLE=OFF" + "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON" + "-DSPDLOG_FMT_EXTERNAL=ON" + ]; + + outputs = [ "out" "doc" "dev" ] ; + + postInstall = '' + mkdir -p $out/share/doc/spdlog + cp -rv ../example $out/share/doc/spdlog + ''; + + doCheck = true; + + meta = with lib; { + description = "Very fast, header only, C++ logging library"; + homepage = "https://github.com/gabime/spdlog"; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4057e0ca1dd7..45b680663abc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39468,10 +39468,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; - inherit (callPackages ../development/libraries/spdlog { }) - spdlog_0 spdlog_1; - - spdlog = spdlog_1; + spdlog = callPackage ../development/libraries/spdlog { }; dart = callPackage ../development/compilers/dart { };