Merge pull request #145006 from Artturin/spdlogupd

2024-09-11 15:08:33 +01:00 · 2021-11-07 23:04:28 +01:00 · 2021-11-07 23:04:28 +01:00 · f2c9cf39e5
parent 7fa8d14f50 b4fab0a98b
commit f2c9cf39e5
12 changed files with 13 additions and 26 deletions
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@ -13,7 +13,6 @@
 , sqlite
 , curl
 , libuchardet
-, fmt
 , spdlog
 }:

@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
    sqlite
    curl
    libuchardet
-    fmt
    spdlog
  ];

--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
 , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
-, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:
+, libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:

 stdenv.mkDerivation rec {
  pname = "far2l";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];

-  buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build
+  buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build
    ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
    #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below

--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@ -10,7 +10,6 @@
 , gtkmm3
 , libsigcxx
 , jsoncpp
-, fmt
 , scdoc
 , spdlog
 , gtk-layer-shell
@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
  strictDeps = false;

  buildInputs = with lib;
-    [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
+    [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
    ++ optional  traySupport  libdbusmenu-gtk3
    ++ optional  pulseSupport libpulseaudio
    ++ optional  sndioSupport sndio
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@ -18,7 +18,6 @@
 , mtxclient
 , boost17x
 , spdlog
-, fmt
 , olm
 , pkg-config
 , nlohmann_json
@ -52,7 +51,6 @@ mkDerivation rec {
    libsecret
    lmdb
    spdlog
-    fmt
    cmark
    qtbase
    qtmultimedia
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
 , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
-, fmt, graphviz, llvmPackages, z3
+, graphviz, llvmPackages, z3
 }:

 stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [ cmake ninja pkg-config ];
-  buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook z3 ]
+  buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ]
    ++ (with python3Packages; [ python pybind11 ])
    ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;

--- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
+++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }:

 stdenv.mkDerivation rec {
  pname = "vowpal-wabbit";
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    boost
    flatbuffers
-    fmt
    rapidjson
    spdlog
    zlib
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@ -16,7 +16,7 @@
 , libcec, libcec_platform, dcadec, libuuid
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1
-, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
+, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
 , lirc
 , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
 , dbusSupport ? true, dbus
@ -125,7 +125,7 @@ in stdenv.mkDerivation {
      libgcrypt libgpg-error libunistring
      libcrossguid libplist
      bluez giflib glib harfbuzz lcms2 libpthreadstubs
-      ffmpeg flatbuffers fmt fstrcmp rapidjson
+      ffmpeg flatbuffers fstrcmp rapidjson
      lirc
      mesa # for libEGL
    ]
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fmt }:
+{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }:

 let
  generic = { version, sha256 }:
@ -15,7 +15,7 @@ let

      nativeBuildInputs = [ cmake ];
      # spdlog <1.3 uses a bundled version of fmt
-      propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt;
+      propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;

      cmakeFlags = [
        "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
@ -49,8 +49,8 @@ let
 in
 {
  spdlog_1 = generic {
-    version = "1.8.5";
-    sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50=";
+    version = "1.9.2";
+    sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
  };

  spdlog_0 = generic {
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@ -8,7 +8,6 @@
 , catch2
 , cmake
 , cython
-, fmt
 , muparserx
 , ninja
 , nlohmann_json
@ -66,7 +65,6 @@ buildPythonPackage rec {
  buildInputs = [
    blas
    catch2
-    fmt
    muparserx
    nlohmann_json
    spdlog
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@ -7,7 +7,6 @@
 , openssl
 , nlohmann_json
 , gtest
-, fmt
 , spdlog
 , c-ares
 , abseil-cpp
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
    openssl
    nlohmann_json
    gtest
-    fmt
    spdlog
    c-ares
    abseil-cpp
--- a/pkgs/servers/gerbera/default.nix
+++ b/pkgs/servers/gerbera/default.nix
@ -4,7 +4,6 @@
 , cmake
 , pkg-config
  # required
-, fmt
 , libiconv
 , libupnp
 , libuuid
@ -88,7 +87,6 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [
-    fmt
    libiconv
    libupnp'
    libuuid
--- a/pkgs/tools/filesystems/lizardfs/default.nix
+++ b/pkgs/tools/filesystems/lizardfs/default.nix
@ -17,7 +17,6 @@
 , judy
 , pam
 , spdlog
-, fmt
 , systemdMinimal
 , zlib # optional
 }:
@ -37,7 +36,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
-    zlib boost judy pam spdlog fmt python3 systemdMinimal
+    zlib boost judy pam spdlog python3 systemdMinimal
  ];

  meta = with lib; {