From ffe22348eb72fe53825cdb486505450bc45a33ee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Aug 2023 21:59:12 +0100 Subject: [PATCH] fmt: 10.0.0 -> 10.1.0 Among other things this pulls upstream fix for glibc-2.38: https://github.com/fmtlib/fmt/commit/e4758590420565c1a4865913615d0feabae6654c Without the change `pkgsi686Linux.fmt` fails tests against `glibc-2.38` as: /build/source/test/chrono-test.cc:733: Failure Expected equality of these values: "44.000000000000" fmt::format("{:%S}", std::chrono::duration( 1.54213895E+26)) --- pkgs/development/libraries/fmt/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4c439717bac..0796febe4ae 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -67,14 +67,7 @@ in }; fmt_10 = generic { - version = "10.0.0"; - sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; - patches = [ - # fixes a test failure on pkgsMusl.fmt - (fetchpatch { - url = "https://github.com/fmtlib/fmt/commit/eaa6307691a9edb9e2f2eacf70500fc6989b416c.diff"; - hash = "sha256-PydnmOn/o9DexBViFGUUAO9KFjVS6CN8GVDHcl/+K8g="; - }) - ]; + version = "10.1.0"; + sha256 = "sha256-t/Mcl3n2dj8UEnptQh4YgpvWrxSYN3iGPZ3LKwzlPAg="; }; }