gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt_8: drop (#355554)

Browse Source
This commit is contained in:
Emily
2024-11-20 02:33:34 +00:00
parent a968157862 e951807e2f
commit c6610175a4
7 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/sp/spdlog/package.nix
+5
View File
@@ -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;
pkgs/development/libraries/fmt/default.nix
-5
View File
@@ -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=";
pkgs/development/libraries/kompute/default.nix
+13 -17
View File
@@ -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; {
pkgs/tools/misc/torrenttools/default.nix
+4
View File
@@ -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
pkgs/tools/misc/torrenttools/fmt-9.patch
+29
View File
@@ -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
pkgs/top-level/aliases.nix
+1
View File
@@ -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
pkgs/top-level/all-packages.nix
+5 -5
View File
@@ -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; };
@@ -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;
@@ -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 { };
@@ -16008,7 +16008,7 @@ with pkgs;
};
torrenttools = callPackage ../tools/misc/torrenttools {
fmt = fmt_8;
fmt = fmt_9;
};
tony = libsForQt5.callPackage ../applications/audio/tony { };
@@ -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