foonathan-memory: 0.7-3 -> 0.7-4

https://github.com/foonathan/memory/releases/tag/v0.7-4

+34 -10
+26
pkgs/by-name/fo/foonathan-memory/0001-Use-system-doctest.patch.patch
··· 1 + From: =?utf-8?q?Timo_R=C3=B6hling?= <timo@gaussglocke.de> 2 + Date: Wed, 2 Dec 2020 15:59:22 +0100 3 + Subject: Use system doctest 4 + 5 + Forwarded: not-needed 6 + --- 7 + test/CMakeLists.txt | 6 +----- 8 + 1 file changed, 1 insertion(+), 5 deletions(-) 9 + 10 + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt 11 + index 37359ea..f269cfb 100644 12 + --- a/test/CMakeLists.txt 13 + +++ b/test/CMakeLists.txt 14 + @@ -8,11 +8,7 @@ target_link_libraries(foonathan_memory_profiling foonathan_memory) 15 + target_include_directories(foonathan_memory_profiling PRIVATE 16 + ${FOONATHAN_MEMORY_SOURCE_DIR}/include/foonathan/memory) 17 + 18 + -# Fetch doctest. 19 + -message(STATUS "Fetching doctest") 20 + -include(FetchContent) 21 + -FetchContent_Declare(doctest URL https://github.com/doctest/doctest/archive/refs/tags/v2.4.12.zip) 22 + -FetchContent_MakeAvailable(doctest) 23 + +find_package(doctest REQUIRED) 24 + 25 + set(tests 26 + test_allocator.hpp
+8 -10
pkgs/by-name/fo/foonathan-memory/package.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchFromGitHub, 5 - fetchpatch, 6 5 cmake, 7 6 doctest, 8 7 }: 9 8 10 9 stdenv.mkDerivation (finalAttrs: { 11 10 pname = "foonathan-memory"; 12 - version = "0.7-3"; 11 + version = "0.7-4"; 13 12 14 13 src = fetchFromGitHub { 15 14 owner = "foonathan"; 16 15 repo = "memory"; 17 16 rev = "v${finalAttrs.version}"; 18 - hash = "sha256-nLBnxPbPKiLCFF2TJgD/eJKJJfzktVBW3SRW2m3WK/s="; 17 + hash = "sha256-qGbI7SL6lDbJzn2hkqaYw35QAyvSPxcZTb0ltDkPUSo="; 19 18 }; 20 19 21 20 patches = [ 22 21 # do not download doctest, use the system doctest instead 23 - (fetchpatch { 24 - url = "https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch"; 25 - hash = "sha256-/MuDeeIh+7osz11VfsAsQzm9HMZuifff+MDU3bDDxRE="; 26 - }) 22 + # originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch 23 + ./0001-Use-system-doctest.patch.patch 27 24 ]; 28 25 29 26 outputs = [ ··· 44 41 45 42 # fix a circular dependency between "out" and "dev" outputs 46 43 postInstall = '' 47 - mkdir -p $dev/lib 48 - mv $out/lib/foonathan_memory $dev/lib/ 44 + mkdir -p $out/lib/cmake 45 + mv $out/lib/foonathan_memory/cmake $out/lib/cmake/foonathan_memory 46 + rmdir $out/lib/foonathan_memory 49 47 ''; 50 48 51 49 meta = with lib; { 52 - homepage = "https://github.com/foonathan/memory"; 50 + homepage = "https://memory.foonathan.net/"; 53 51 changelog = "https://github.com/foonathan/memory/releases/tag/${finalAttrs.src.rev}"; 54 52 description = "STL compatible C++ memory allocator library"; 55 53 mainProgram = "nodesize_dbg";