From b4fab0a98b28ee09102aeac511a967be6253572e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 7 Nov 2021 21:59:57 +0200 Subject: [PATCH] treewide: remove fmt from buildInputs where spdlog is used spdlog_1 has fmt_8 in propagatedBuildInputs and having fmt which points to fmt_7 in buildInputs makes the builds use wrong fmt --- pkgs/applications/misc/cherrytree/default.nix | 2 -- pkgs/applications/misc/far2l/default.nix | 4 ++-- pkgs/applications/misc/waybar/default.nix | 3 +-- .../networking/instant-messengers/nheko/default.nix | 2 -- .../science/electronics/hal-hardware-analyzer/default.nix | 4 ++-- .../science/machine-learning/vowpal-wabbit/default.nix | 3 +-- pkgs/applications/video/kodi/unwrapped.nix | 4 ++-- pkgs/development/python-modules/qiskit-aer/default.nix | 2 -- pkgs/development/tools/build-managers/bear/default.nix | 2 -- pkgs/servers/gerbera/default.nix | 2 -- pkgs/tools/filesystems/lizardfs/default.nix | 3 +-- 11 files changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 61150d56fbbd..5802f21a8749 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -13,7 +13,6 @@ , sqlite , curl , libuchardet -, fmt , spdlog }: @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { sqlite curl libuchardet - fmt spdlog ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 87eaed975352..3e74d04c5128 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick -, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: +, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }: stdenv.mkDerivation rec { pname = "far2l"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; - buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index a38c1002a01f..38ea7c909c05 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -10,7 +10,6 @@ , gtkmm3 , libsigcxx , jsoncpp -, fmt , scdoc , spdlog , gtk-layer-shell @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { strictDeps = false; buildInputs = with lib; - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] + [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional sndioSupport sndio diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index b097864af431..ffd04fd829ed 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -18,7 +18,6 @@ , mtxclient , boost17x , spdlog -, fmt , olm , pkg-config , nlohmann_json @@ -52,7 +51,6 @@ mkDerivation rec { libsecret lmdb spdlog - fmt cmark qtbase qtmultimedia diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index b30a18931213..f1d34062d2aa 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, fmt, graphviz, llvmPackages, z3 +, graphviz, llvmPackages, z3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7ecbe09f5e18..7e9b322b4157 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost flatbuffers - fmt rapidjson spdlog zlib diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 7221e668f4e1..5fa652de0c7e 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -16,7 +16,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 -, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson +, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson , lirc , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus @@ -125,7 +125,7 @@ in stdenv.mkDerivation { libgcrypt libgpg-error libunistring libcrossguid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs - ffmpeg flatbuffers fmt fstrcmp rapidjson + ffmpeg flatbuffers fstrcmp rapidjson lirc mesa # for libEGL ] diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 89041f7508df..141eba29f314 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -8,7 +8,6 @@ , catch2 , cmake , cython -, fmt , muparserx , ninja , nlohmann_json @@ -66,7 +65,6 @@ buildPythonPackage rec { buildInputs = [ blas catch2 - fmt muparserx nlohmann_json spdlog diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index a81a57235408..552cb0573665 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -7,7 +7,6 @@ , openssl , nlohmann_json , gtest -, fmt , spdlog , c-ares , abseil-cpp @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { openssl nlohmann_json gtest - fmt spdlog c-ares abseil-cpp diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index cd70bd352a73..368f2f494151 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -4,7 +4,6 @@ , cmake , pkg-config # required -, fmt , libiconv , libupnp , libuuid @@ -88,7 +87,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - fmt libiconv libupnp' libuuid diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index a9e0cd12d9d4..aa2260cb374d 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -17,7 +17,6 @@ , judy , pam , spdlog -, fmt , systemdMinimal , zlib # optional }: @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl - zlib boost judy pam spdlog fmt python3 systemdMinimal + zlib boost judy pam spdlog python3 systemdMinimal ]; meta = with lib; {