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