diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 569696bf9f7e..d9ba29def720 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -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 { }; diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix index 9d0fa9389025..53b70d049588 100644 --- a/pkgs/by-name/ge/gerbera/package.nix +++ b/pkgs/by-name/ge/gerbera/package.nix @@ -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)); diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index c73045bca47e..b98a327addb3 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -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 diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index e2e360d7ca3b..c13d6eea83f4 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -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 diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix index 332c4ec66e7f..a2b6fece2e09 100644 --- a/pkgs/by-name/mu/multipass/multipassd.nix +++ b/pkgs/by-name/mu/multipass/multipassd.nix @@ -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 diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index ff28e839e94a..a5dcddea496a 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -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 diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 709713a9bbb5..4dfaaefda6a7 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -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 diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index 65e51db70263..b72ba3e6316b 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -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 diff --git a/pkgs/by-name/ve/veridian/package.nix b/pkgs/by-name/ve/veridian/package.nix index fc9770d53817..85cdc66221fa 100644 --- a/pkgs/by-name/ve/veridian/package.nix +++ b/pkgs/by-name/ve/veridian/package.nix @@ -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 diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 1f4977a40671..1816bc34f7ed 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -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 diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 014b85a1f7ed..e700f8312f03 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 443a40285aab..b2383504bf38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };