git.iko.soy/typeable/nixpkgs
on master help sign in
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

commitb4fab0a98b28ee09102aeac511a967be6253572e authorArtturin <Artturin@artturin.com> dateSun 7 Nov 2021, 21:59 (5 years ago) parentf06cec9
11 files changed+9−22
compare with master
unifiedsplit
pkgs/applications/misc/cherrytree/default.nix−2 pkgs/applications/misc/far2l/default.nix+2−2 pkgs/applications/misc/waybar/default.nix+1−2 pkgs/applications/networking/instant-messengers/nheko/default.nix−2 pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+2−2 pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix+1−2 pkgs/applications/video/kodi/unwrapped.nix+2−2 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+1−2
pkgs/applications/misc/cherrytree/default.nix−2
@@ -13,7 +13,6 @@
1313, sqlite
1414, curl
1515, libuchardet
16−, fmt
1716, spdlog
1817}:
1918
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
4443 sqlite
4544 curl
4645 libuchardet
47− fmt
4846 spdlog
4947 ];
5048
pkgs/applications/misc/far2l/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
22, 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 }:
44
55stdenv.mkDerivation rec {
66 pname = "far2l";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
1717
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
1919 ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
2020 #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below
2121
pkgs/applications/misc/waybar/default.nix+1−2
@@ -10,7 +10,6 @@
1010, gtkmm3
1111, libsigcxx
1212, jsoncpp
13−, fmt
1413, scdoc
1514, spdlog
1615, gtk-layer-shell
@@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
5150 strictDeps = false;
5251
5352 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 ]
5554 ++ optional traySupport libdbusmenu-gtk3
5655 ++ optional pulseSupport libpulseaudio
5756 ++ optional sndioSupport sndio
pkgs/applications/networking/instant-messengers/nheko/default.nix−2
@@ -18,7 +18,6 @@
1818, mtxclient
1919, boost17x
2020, spdlog
21−, fmt
2221, olm
2322, pkg-config
2423, nlohmann_json
@@ -52,7 +51,6 @@ mkDerivation rec {
5251 libsecret
5352 lmdb
5453 spdlog
55− fmt
5654 cmark
5755 qtbase
5856 qtmultimedia
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
22, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
3−, fmt, graphviz, llvmPackages, z3
3+, graphviz, llvmPackages, z3
44}:
55
66stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 '';
2323
2424 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 ]
2626 ++ (with python3Packages; [ python pybind11 ])
2727 ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
2828
pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix+1−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }:
1+{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }:
22
33stdenv.mkDerivation rec {
44 pname = "vowpal-wabbit";
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
1616 buildInputs = [
1717 boost
1818 flatbuffers
19− fmt
2019 rapidjson
2120 spdlog
2221 zlib
pkgs/applications/video/kodi/unwrapped.nix+2−2
@@ -16,7 +16,7 @@
1616, libcec, libcec_platform, dcadec, libuuid
1717, libcrossguid, libmicrohttpd
1818, 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
2020, lirc
2121, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
2222, dbusSupport ? true, dbus
@@ -125,7 +125,7 @@ in stdenv.mkDerivation {
125125 libgcrypt libgpg-error libunistring
126126 libcrossguid libplist
127127 bluez giflib glib harfbuzz lcms2 libpthreadstubs
128− ffmpeg flatbuffers fmt fstrcmp rapidjson
128+ ffmpeg flatbuffers fstrcmp rapidjson
129129 lirc
130130 mesa # for libEGL
131131 ]
pkgs/development/python-modules/qiskit-aer/default.nix−2
@@ -8,7 +8,6 @@
88, catch2
99, cmake
1010, cython
11−, fmt
1211, muparserx
1312, ninja
1413, nlohmann_json
@@ -66,7 +65,6 @@ buildPythonPackage rec {
6665 buildInputs = [
6766 blas
6867 catch2
69− fmt
7068 muparserx
7169 nlohmann_json
7270 spdlog
pkgs/development/tools/build-managers/bear/default.nix−2
@@ -7,7 +7,6 @@
77, openssl
88, nlohmann_json
99, gtest
10−, fmt
1110, spdlog
1211, c-ares
1312, abseil-cpp
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
3534 openssl
3635 nlohmann_json
3736 gtest
38− fmt
3937 spdlog
4038 c-ares
4139 abseil-cpp
pkgs/servers/gerbera/default.nix−2
@@ -4,7 +4,6 @@
44, cmake
55, pkg-config
66 # required
7−, fmt
87, libiconv
98, libupnp
109, libuuid
@@ -88,7 +87,6 @@ stdenv.mkDerivation rec {
8887 nativeBuildInputs = [ cmake pkg-config ];
8988
9089 buildInputs = [
91− fmt
9290 libiconv
9391 libupnp'
9492 libuuid
pkgs/tools/filesystems/lizardfs/default.nix+1−2
@@ -17,7 +17,6 @@
1717, judy
1818, pam
1919, spdlog
20−, fmt
2120, systemdMinimal
2221, zlib # optional
2322}:
@@ -37,7 +36,7 @@ stdenv.mkDerivation rec {
3736
3837 buildInputs = [
3938 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
4140 ];
4241
4342 meta = with lib; {