treewide: fmt_11 -> fmt

This commit is contained in:
Emily
2025-09-12 00:55:37 +01:00
parent 44c777dcb9
commit 3d71d3e33b
12 changed files with 26 additions and 35 deletions
+3 -4
View File
@@ -23,7 +23,7 @@
libunwind,
boost,
fmt_11,
fmt,
jemalloc,
gtest,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
# `folly-config.cmake` pulls these in.
boost
fmt_11
fmt
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# jemalloc headers are required in include/folly/portability/Malloc.h
@@ -190,8 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
inherit boost;
fmt = fmt_11;
inherit boost fmt;
updateScript = nix-update-script { };
+2 -2
View File
@@ -13,7 +13,7 @@
spdlog,
sqlite,
zlib,
fmt_11,
fmt,
# options
enableMysql ? false,
libmysqlclient,
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
spdlog
sqlite
zlib
fmt_11
fmt
]
++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
+3 -3
View File
@@ -14,7 +14,7 @@
python3Packages,
boost,
fmt_11,
fmt,
gtest,
icu,
spdlog,
@@ -66,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
fmt_11
fmt
gtest
icu
(spdlog.override { fmt = fmt_11; })
spdlog
tbb_2021
finalAttrs.passthru.yaml-cpp # has merge-key support
+2 -2
View File
@@ -3,7 +3,7 @@
lib,
stdenv,
cmake,
fmt_11,
fmt,
spdlog,
tl-expected,
nlohmann_json,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
fmt_11
fmt
spdlog
tl-expected
nlohmann_json
+2 -2
View File
@@ -6,7 +6,7 @@
cmake,
dnsmasq,
fetchFromGitHub,
fmt_11,
fmt,
git,
grpc,
gtest,
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ];
buildInputs = [
fmt_11
fmt
grpc
gtest
libapparmor
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
cmake,
expat,
fmt_11,
fmt,
proj,
bzip2,
cli11,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
bzip2
cli11
expat
fmt_11
fmt
libosmium
libpq
nlohmann_json
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitHub,
cmake,
doctest,
fmt_11,
fmt,
perl,
glib,
luajit,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
buildInputs = [
doctest
fmt_11
fmt
glib
openssl
pcre
+2 -2
View File
@@ -6,7 +6,7 @@
catch2_3,
cmake,
ninja,
fmt_11,
fmt,
mimalloc,
python3,
}:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost
fmt_11
fmt
mimalloc
# though only used in tests, cmake will complain its absence when configuring
catch2_3
+2 -2
View File
@@ -8,7 +8,7 @@
pkg-config,
boost,
fmt_11,
fmt,
openssl,
sv-lang,
mimalloc,
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage {
buildInputs = [
boost
fmt_11
fmt
openssl
sv-lang
mimalloc
@@ -13,7 +13,7 @@
# buildInputs
apple-sdk_14,
fmt_11,
fmt,
nanobind,
nlohmann_json,
pybind11,
@@ -96,7 +96,7 @@ let
buildInputs = [
apple-sdk_14
fmt_11
fmt
gguf-tools
nanobind
nlohmann_json
+3 -3
View File
@@ -46,7 +46,7 @@ let
libxml2,
linux-pam,
numactl,
fmt_11,
fmt,
withStorageMroonga ? true,
kytea,
libsodium,
@@ -231,7 +231,7 @@ let
];
buildInputs =
common.buildInputs ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
common.buildInputs ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt ];
cmakeFlags = common.cmakeFlags ++ [
"-DPLUGIN_AUTH_PAM=NO"
@@ -286,7 +286,7 @@ let
msgpack
zeromq
]
++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt ];
propagatedBuildInputs = lib.optional withNuma numactl;
+1 -9
View File
@@ -393,10 +393,6 @@ with pkgs;
protobuf = protobuf_21;
};
vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
fmt = fmt_11;
};
r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
deviceTree = callPackage ../os-specific/linux/device-tree { };
@@ -2427,7 +2423,7 @@ with pkgs;
# To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule.
#
# Ceph does not currently build with `fmt_10`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
# Ceph does not currently build with `fmt_11`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
# If we want to switch for that before upstream fixes it, use this patch:
# https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638
fmt = fmt_9;
@@ -9027,10 +9023,6 @@ with pkgs;
tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
termbench-pro = callPackage ../by-name/te/termbench-pro/package.nix {
fmt = fmt_11;
};
tinyxml = tinyxml2;
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };