From 8e3554d3e3fbe6e286c77fbbc1a19b244a6d7c78 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 03:44:30 +0000 Subject: [PATCH 1/6] termbench-pro: bump to `fmt_11` --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4dbf3800cea..aa116a3908ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11081,7 +11081,7 @@ with pkgs; harfbuzz = harfbuzzFull; }; - termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; }; + termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_11; }; texpresso = callPackage ../tools/typesetting/tex/texpresso { texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { }; From 693a0eaedefbe9361b53427dfcc0a3652153f074 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 15:32:09 +0000 Subject: [PATCH 2/6] torrenttools: patch for `fmt_9` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’d take more work to get this working with the latest version, and this project seems abandoned, so I didn’t bother for now. --- pkgs/tools/misc/torrenttools/default.nix | 4 ++++ pkgs/tools/misc/torrenttools/fmt-9.patch | 29 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/torrenttools/fmt-9.patch diff --git a/pkgs/tools/misc/torrenttools/default.nix b/pkgs/tools/misc/torrenttools/default.nix index 6daa39dd7e73..3a634ec17373 100644 --- a/pkgs/tools/misc/torrenttools/default.nix +++ b/pkgs/tools/misc/torrenttools/default.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { ]; sourceRoot = "torrenttools"; + patches = [ + ./fmt-9.patch + ]; + postUnpack = '' cp -pr cliprogress torrenttools/external/cliprogress cp -pr dottorrent torrenttools/external/dottorrent diff --git a/pkgs/tools/misc/torrenttools/fmt-9.patch b/pkgs/tools/misc/torrenttools/fmt-9.patch new file mode 100644 index 000000000000..5bdc666d4bd2 --- /dev/null +++ b/pkgs/tools/misc/torrenttools/fmt-9.patch @@ -0,0 +1,29 @@ +diff --git a/include/file_matcher.hpp b/include/file_matcher.hpp +index c10c7be405..b67baec0ef 100644 +--- a/include/file_matcher.hpp ++++ b/include/file_matcher.hpp +@@ -47,7 +47,7 @@ + } + + std::string error; +- std::string pattern = ".*.{}$"_format(extension); ++ std::string pattern = fmt::format(".*.{}$", extension); + file_include_list_.Add(pattern, &error); + file_include_list_empty_ = false; + Ensures(error.empty()); +@@ -62,7 +62,7 @@ + } + + std::string error; +- std::string pattern = ".*\\.{}$"_format(extension); ++ std::string pattern = fmt::format(".*\\.{}$", extension); + file_exclude_list_.Add(pattern, &error); + file_exclude_list_empty_ = false; + Ensures(error.empty()); +@@ -243,4 +243,4 @@ + }; + + +-} // namespace torrenttools +\ No newline at end of file ++} // namespace torrenttools diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa116a3908ae..2649ac69fdbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16008,7 +16008,7 @@ with pkgs; }; torrenttools = callPackage ../tools/misc/torrenttools { - fmt = fmt_8; + fmt = fmt_9; }; tony = libsForQt5.callPackage ../applications/audio/tony { }; From 032868bd505b234ed2d19cd29c5ca49bf99a5dcc Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 23:38:35 +0000 Subject: [PATCH 3/6] spdlog: `#define SPDLOG_FMT_EXTERNAL` This is required for the headers to work properly. --- pkgs/by-name/sp/spdlog/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 6aa91db83549..0c9777b1ca88 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/doc/spdlog cp -rv ../example $out/share/doc/spdlog + + substituteInPlace $dev/include/spdlog/tweakme.h \ + --replace-fail \ + '// #define SPDLOG_FMT_EXTERNAL' \ + '#define SPDLOG_FMT_EXTERNAL' ''; doCheck = true; From e8db327d116e43c522a16c05a949cf3bdf00dcfb Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 02:47:26 +0000 Subject: [PATCH 4/6] kompute: 0.8.1 -> 0.9.0 --- .../development/libraries/kompute/default.nix | 30 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix index ced30a87dbfa..04b21d9ce026 100644 --- a/pkgs/development/libraries/kompute/default.nix +++ b/pkgs/development/libraries/kompute/default.nix @@ -6,41 +6,37 @@ , vulkan-headers , vulkan-loader , fmt +, spdlog , glslang , ninja }: stdenv.mkDerivation rec { pname = "kompute"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "KomputeProject"; repo = "kompute"; rev = "v${version}"; - sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo="; + hash = "sha256-cf9Ef85R+VKao286+WHLgBWUqgwvuRocgeCzVJOGbdc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff"; - sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY="; - }) - (fetchpatch { - name = "enum-class-fix-for-fmt-8-x.patch"; - url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch"; - sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0="; - }) - ]; - cmakeFlags = [ + "-DKOMPUTE_OPT_USE_SPDLOG=ON" + # Doesn’t work without the vendored `spdlog`, and is redundant. + "-DKOMPUTE_OPT_LOG_LEVEL_DISABLED=ON" + "-DKOMPUTE_OPT_USE_BUILT_IN_SPDLOG=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_PYBIND11=OFF" + "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" + "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" "-DKOMPUTE_OPT_INSTALL=1" - "-DRELEASE=1" - "-DKOMPUTE_ENABLE_SPDLOG=1" ]; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ fmt ]; + buildInputs = [ fmt spdlog ]; propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2649ac69fdbe..ea024cc7edca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18393,7 +18393,7 @@ with pkgs; kmonad = haskellPackages.kmonad.bin; kompute = callPackage ../development/libraries/kompute { - fmt = fmt_8; + fmt = fmt_10; }; # In general we only want keep the last three minor versions around that From cdb8260d7c88cc032e8faba42f7d7f99fd8d7bed Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 03:08:20 +0000 Subject: [PATCH 5/6] irods{,-icommands}: bump to `fmt_9` --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea024cc7edca..dd650846aab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3895,7 +3895,7 @@ with pkgs; stdenv = llvmPackages_13.libcxxStdenv; libcxx = llvmPackages_13.libcxx; boost = boost178.override { inherit stdenv; }; - fmt = fmt_8.override { inherit stdenv; }; + fmt = fmt_9.override { inherit stdenv; }; nanodbc_llvm = nanodbc.override { inherit stdenv; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; spdlog_llvm = spdlog.override { inherit stdenv fmt; }; From e951807e2f7311fad126c54e3e3aa12a8cdfeda2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 03:31:01 +0000 Subject: [PATCH 6/6] fmt_8: drop --- pkgs/development/libraries/fmt/default.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 01b2b6828611..3edf0692e439 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -69,11 +69,6 @@ let }; in { - fmt_8 = generic { - version = "8.1.1"; - hash = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; - }; - fmt_9 = generic { version = "9.1.0"; hash = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1446446b7d6c..dd2ad607389f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -382,6 +382,7 @@ mapAliases { flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 + fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd650846aab1..10b1e3a191c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9188,7 +9188,7 @@ with pkgs; fltk = fltk13; fltk-minimal = fltk13-minimal; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11; + inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11; fmt = fmt_10;