diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/development/libraries/spdlog | |
parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/spdlog')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/spdlog/default.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index fe648a2ce7bf..d68e22f1c891 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -3,10 +3,8 @@ , fetchFromGitHub , fetchpatch , cmake -# Although we include upstream patches that fix compilation with fmt_10, we -# still use fmt_9 because this dependency is propagated, and many of spdlog's -# reverse dependencies don't support fmt_10 yet. -, fmt_9 +, fmt +, catch2_3 , staticBuild ? stdenv.hostPlatform.isStatic # tests @@ -15,29 +13,26 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ="; + hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns="; }; patches = [ - # Fix compatiblity with fmt 10.0. Remove with the next release + # Fix a broken test, 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="; + url = "https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a.patch"; + hash = "sha256-L79yOkm3VY01jmxNctfneTLmOA5DEQeNNGC8LbpJiOc="; }) ]; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ fmt_9 ]; + propagatedBuildInputs = [ fmt ]; + checkInputs = [ catch2_3 ]; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" |