b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

spdlog: 1.10.0 -> 1.11.0

Browse source 
Unpin from fmt_8.
This commit is contained in:
Nicolas Benes 2023-03-22 18:55:22 +01:00
parent 579296ff47
commit 3e886954ee
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
View file

@ -41,7 +41,7 @@ let
# no stable hal release yet with recent spdlog/fmt support, remove
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
spdlog' = spdlog.override {
fmt_8 = fmt_8.overrideAttrs (_: rec {
fmt = fmt_8.overrideAttrs (_: rec {
version = "8.0.1";
src = fetchFromGitHub {
owner = "fmtlib";

15
pkgs/development/libraries/spdlog/default.nix
View file

@ -1,27 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch
{ lib, stdenv, fetchFromGitHub, cmake, fmt
, staticBuild ? stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
pname = "spdlog";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "gabime";
repo = "spdlog";
rev = "v${version}";
hash = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws=";
hash = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ=";
};
# in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380
patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch {
name = "fix-pkg-config.patch";
url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch";
sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q";
});
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ fmt_8 ];
propagatedBuildInputs = [ fmt ];
cmakeFlags = [
"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"