pyrox.dev / nixpkgs
lol
fork atom

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

Artturin b4fab0a9 f06cec95

+9 -22
unified split
-2
pkgs/applications/misc/cherrytree/default.nix
··· 13 13 , sqlite 14 14 , curl 15 15 , libuchardet 16 - , fmt 17 16 , spdlog 18 17 }: 19 18 ··· 44 43 sqlite 45 44 curl 46 45 libuchardet 47 - fmt 48 46 spdlog 49 47 ]; 50 48
+2 -2
pkgs/applications/misc/far2l/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash 2 2 , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick 3 - , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: 3 + , libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "far2l"; ··· 15 15 16 16 nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; 17 17 18 - buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build 18 + buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build 19 19 ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats 20 20 #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below 21 21
+1 -2
pkgs/applications/misc/waybar/default.nix
··· 10 10 , gtkmm3 11 11 , libsigcxx 12 12 , jsoncpp 13 - , fmt 14 13 , scdoc 15 14 , spdlog 16 15 , gtk-layer-shell ··· 51 50 strictDeps = false; 52 51 53 52 buildInputs = with lib; 54 - [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] 53 + [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] 55 54 ++ optional traySupport libdbusmenu-gtk3 56 55 ++ optional pulseSupport libpulseaudio 57 56 ++ optional sndioSupport sndio
-2
pkgs/applications/networking/instant-messengers/nheko/default.nix
··· 18 18 , mtxclient 19 19 , boost17x 20 20 , spdlog 21 - , fmt 22 21 , olm 23 22 , pkg-config 24 23 , nlohmann_json ··· 52 51 libsecret 53 52 lmdb 54 53 spdlog 55 - fmt 56 54 cmark 57 55 qtbase 58 56 qtmultimedia
+2 -2
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages 2 2 , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook 3 - , fmt, graphviz, llvmPackages, z3 3 + , graphviz, llvmPackages, z3 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 22 22 ''; 23 23 24 24 nativeBuildInputs = [ cmake ninja pkg-config ]; 25 - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ] 25 + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ] 26 26 ++ (with python3Packages; [ python pybind11 ]) 27 27 ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; 28 28
+1 -2
pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: 1 + { lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "vowpal-wabbit"; ··· 16 16 buildInputs = [ 17 17 boost 18 18 flatbuffers 19 - fmt 20 19 rapidjson 21 20 spdlog 22 21 zlib
+2 -2
pkgs/applications/video/kodi/unwrapped.nix
··· 16 16 , libcec, libcec_platform, dcadec, libuuid 17 17 , libcrossguid, libmicrohttpd 18 18 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 19 - , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson 19 + , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson 20 20 , lirc 21 21 , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp 22 22 , dbusSupport ? true, dbus ··· 125 125 libgcrypt libgpg-error libunistring 126 126 libcrossguid libplist 127 127 bluez giflib glib harfbuzz lcms2 libpthreadstubs 128 - ffmpeg flatbuffers fmt fstrcmp rapidjson 128 + ffmpeg flatbuffers fstrcmp rapidjson 129 129 lirc 130 130 mesa # for libEGL 131 131 ]
-2
pkgs/development/python-modules/qiskit-aer/default.nix
··· 8 8 , catch2 9 9 , cmake 10 10 , cython 11 - , fmt 12 11 , muparserx 13 12 , ninja 14 13 , nlohmann_json ··· 66 65 buildInputs = [ 67 66 blas 68 67 catch2 69 - fmt 70 68 muparserx 71 69 nlohmann_json 72 70 spdlog
-2
pkgs/development/tools/build-managers/bear/default.nix
··· 7 7 , openssl 8 8 , nlohmann_json 9 9 , gtest 10 - , fmt 11 10 , spdlog 12 11 , c-ares 13 12 , abseil-cpp ··· 35 34 openssl 36 35 nlohmann_json 37 36 gtest 38 - fmt 39 37 spdlog 40 38 c-ares 41 39 abseil-cpp
-2
pkgs/servers/gerbera/default.nix
··· 4 4 , cmake 5 5 , pkg-config 6 6 # required 7 - , fmt 8 7 , libiconv 9 8 , libupnp 10 9 , libuuid ··· 88 87 nativeBuildInputs = [ cmake pkg-config ]; 89 88 90 89 buildInputs = [ 91 - fmt 92 90 libiconv 93 91 libupnp' 94 92 libuuid
+1 -2
pkgs/tools/filesystems/lizardfs/default.nix
··· 17 17 , judy 18 18 , pam 19 19 , spdlog 20 - , fmt 21 20 , systemdMinimal 22 21 , zlib # optional 23 22 }: ··· 37 36 38 37 buildInputs = [ 39 38 db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl 40 - zlib boost judy pam spdlog fmt python3 systemdMinimal 39 + zlib boost judy pam spdlog python3 systemdMinimal 41 40 ]; 42 41 43 42 meta = with lib; {