Merge pull request #233330 from marsam/update-fmt

pkgs/applications/video/mkvtoolnix/default.nix

@@ -56,6 +56,15 @@ stdenv.mkDerivation rec {
     sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk=";
   };
 
+  patches = [
+    # Fix compatiblity with fmt 10.0. Remove with the next release
+    (fetchpatch {
+      url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc.patch";
+      hash = "sha256-vOm3FmXL3mHzs3RHCJ9gbTLSe3xhSXo8IfgA+s0cFjY=";
+      includes = [ "src/common/codec.h" ];
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     docbook_xsl

pkgs/development/compilers/clasp/default.nix

@@ -55,7 +55,7 @@ in llvmPackages_15.stdenv.mkDerivation {
     sbcl
     git
     pkg-config
-    fmt
+    fmt_9
     gmpxx
     libelf
     boost

pkgs/development/libraries/fmt/default.nix

@@ -1,5 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
 , enableShared ? !stdenv.hostPlatform.isStatic
+
+# tests
+, mpd
+, openimageio
+, fcitx5
+, spdlog
 }:
 
 let
@@ -27,6 +36,10 @@ let
 
       doCheck = true;
 
+      passthru.tests = {
+        inherit mpd openimageio fcitx5 spdlog;
+      };
+
       meta = with lib; {
         description = "Small, safe and fast formatting library";
         longDescription = ''
@@ -34,6 +47,7 @@ let
           used as a fast and safe alternative to printf and IOStreams.
         '';
         homepage = "https://fmt.dev/";
+        changelog = "https://github.com/fmtlib/fmt/blob/${version}/ChangeLog.rst";
         downloadPage = "https://github.com/fmtlib/fmt/";
         maintainers = [ maintainers.jdehaas ];
         license = licenses.mit;
@@ -51,4 +65,9 @@ in
     version = "9.1.0";
     sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
   };
+
+  fmt_10 = generic {
+    version = "10.0.0";
+    sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8=";
+  };
 }

pkgs/development/libraries/spdlog/default.nix

@@ -1,5 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fmt
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt
 , staticBuild ? stdenv.hostPlatform.isStatic
+
+# tests
+, bear, tiledb
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +16,18 @@ stdenv.mkDerivation rec {
     hash  = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ=";
   };
 
+  patches = [
+    # Fix compatiblity with fmt 10.0. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05.patch";
+      hash = "sha256-cRsQilkyUQW47PFpDwKgU/pm+tOeLvwPx32gNOPAO1U=";
+    })
+    (fetchpatch {
+      url = "https://github.com/gabime/spdlog/commit/af1785b897c9d1098d4aa7213fad232be63c19b4.patch";
+      hash = "sha256-zpfLiBeDAOsvk4vrIyXC0kvFe2WkhAhersd+fhA8DFY=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   propagatedBuildInputs = [ fmt ];
 
@@ -34,6 +49,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.tests = {
+    inherit bear tiledb;
+  };
+
   meta = with lib; {
     description    = "Very fast, header only, C++ logging library";
     homepage       = "https://github.com/gabime/spdlog";

pkgs/development/tools/build-managers/bear/default.nix

@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pkg-config
 , grpc
@@ -43,6 +44,12 @@ stdenv.mkDerivation rec {
   patches = [
     # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/...
     ./no-double-relative.patch
+
+    # Fix compatiblity with fmt 10.0. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/rizsotto/Bear/commit/46a032fa0fc8131779ece13f26735ec84be891e8.patch";
+      hash = "sha256-zYKwQ5PLSTJ1hROGnTfP8xPoM0cBw6abAZLx6GxmdfI=";
+    })
   ];
 
   meta = with lib; {

pkgs/tools/inputmethods/fcitx5/default.nix

@@ -2,6 +2,7 @@
 , stdenv
 , fetchurl
 , fetchFromGitHub
+, fetchpatch
 , pkg-config
 , cmake
 , extra-cmake-modules
@@ -51,6 +52,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-zS25XeNtBN7QIi+Re/p1uLoH/Q4xKAsFrEmgk2LYRu8=";
   };
 
+  patches = [
+    # Fix compatiblity with fmt 10.0. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch";
+      hash = "sha256-Z4Sqdyp/doJPTB+hEUrG9vncUP29L/b0yJ/u5ldpnds=";
+    })
+  ];
+
   prePatch = ''
     ln -s ${enDict} src/modules/spell/$(stripHash ${enDict})
   '';

pkgs/top-level/all-packages.nix

@@ -20692,9 +20692,9 @@ with pkgs;
 
   flyway = callPackage ../development/tools/flyway { };
 
-  inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9;
+  inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10;
 
-  fmt = fmt_9;
+  fmt = fmt_10;
 
   fplll = callPackage ../development/libraries/fplll { };
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };