Merge pull request #222632 from panicgh/spdlog-upd (b0989ca6) · Commits · mdf / nixpkgs

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";

pkgs/development/libraries/spdlog/default.nix

+36 −60

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch
		{ lib, stdenv, fetchFromGitHub, cmake, fmt
		, staticBuild ? stdenv.hostPlatform.isStatic
		}:

		let
		generic = { version, sha256 }:
		stdenv.mkDerivation {
		stdenv.mkDerivation rec {
		pname = "spdlog";
		inherit version;
		version = "1.11.0";

		src = fetchFromGitHub {
		owner = "gabime";
		repo = "spdlog";
		rev = "v${version}";
		inherit sha256;
		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 ];
		# spdlog <1.3 uses a bundled version of fmt
		propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8;
		propagatedBuildInputs = [ fmt ];

		cmakeFlags = [
		"-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}"
		@@ -35,9 +25,7 @@ let
		"-DSPDLOG_FMT_EXTERNAL=ON"
		];

		outputs = [ "out" "doc" ]
		# spdlog <1.4 is header only, no need to split libraries and headers
		++ lib.optional (lib.versionAtLeast version "1.4") "dev";
		outputs = [ "out" "doc" "dev" ] ;

		postInstall = ''
		mkdir -p $out/share/doc/spdlog
		@@ -53,16 +41,4 @@ let
		maintainers = with maintainers; [ obadz ];
		platforms = platforms.all;
		};
		};
		in
		{
		spdlog_1 = generic {
		version = "1.10.0";
		sha256 = "sha256-c6s27lQCXKx6S1FhZ/LiKh14GnXMhZtD1doltU4Avws=";
		};

		spdlog_0 = generic {
		version = "0.17.0";
		sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9";
		};
		}

pkgs/development/libraries/tiledb/default.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		, lz4
		, bzip2
		, zstd
		, spdlog_0
		, spdlog
		, tbb
		, openssl
		, boost
		@@ -21,13 +21,13 @@

		stdenv.mkDerivation rec {
		pname = "tiledb";
		version = "2.3.3";
		version = "2.8.3";

		src = fetchFromGitHub {
		owner = "TileDB-Inc";
		repo = "TileDB";
		rev = version;
		sha256 = "sha256-3Z5+QUzo2f24q11j6s8KX2vHLFkipFvGk2VFComWW/o=";
		hash = "sha256-HKMVwrPnk9/mukH3mJ2LEAvA9LBF4PcgBZjbbLhO9qU=";
		};

		# (bundled) blosc headers have a warning on some archs that it will be using
		@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
		lz4
		bzip2
		zstd
		spdlog_0
		spdlog
		tbb
		openssl
		boost
		@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
		ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include
		'';

		doCheck = false; # 9 failing tests due to what seems an overflow
		doCheck = true;

		installTargets = [ "install-tiledb" "doc" ];

pkgs/development/tools/poac/default.nix

+0 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		, git2-cpp
		, cacert
		, boost179
		, fmt_8
		, icu
		, libarchive
		, libgit2
		@@ -60,7 +59,6 @@ stdenv.mkDerivation rec {
		cmakeFlags = [
		"-DPOAC_BUILD_TESTING=OFF"
		"-DCPM_SOURCE_CACHE=${placeholder "out"}/share"
		"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}"
		"-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2-cpp.src}"
		"-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}"
		"-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${package-project-cmake.src}"
		@@ -76,7 +74,6 @@ stdenv.mkDerivation rec {
		enableShared = stdenv.isDarwin;
		enableStatic = !stdenv.isDarwin;
		})
		fmt_8
		git2-cpp
		glob
		package-project-cmake

pkgs/tools/package-management/micromamba/default.nix

+1 −17

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		, spdlog
		, termcolor
		, tl-expected
		, fmt_9
		}:

		let
		@@ -34,20 +33,6 @@ let
		})
		];
		});

		spdlog' = spdlog.overrideAttrs (oldAttrs: {
		# Use as header-only library.
		#
		# Spdlog 1.11 requires fmt version 8 while micromamba requires
		# version 9. spdlog may use its bundled version of fmt,
		# though. Micromamba is not calling spdlog functions with
		# fmt-types in their signature. I.e. we get away with removing
		# fmt_8 from spdlog's propagated dependencies and using fmt_9 for
		# micromamba itself.
		dontBuild = true;
		cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DSPDLOG_FMT_EXTERNAL=OFF" ];
		propagatedBuildInputs = [];
		});
		in
		stdenv.mkDerivation rec {
		pname = "micromamba";
		@@ -71,12 +56,11 @@ stdenv.mkDerivation rec {
		yaml-cpp
		libsolv'
		reproc
		spdlog'
		spdlog
		termcolor
		ghc_filesystem
		python3
		tl-expected
		fmt_9
		];

		cmakeFlags = [

Admin message