summary refs log tree commit diff
path: root/gnu/packages/patches/libexpected-nofetch.patch
diff options
context:
space:
mode:
authorJosselin Poiret <dev@jpoiret.xyz>2023-04-27 15:08:25 +0200
committerLudovic Courtès <ludo@gnu.org>2023-04-28 21:13:36 +0200
commit4884ee6dd4b1694a4a502dd8058d6c61fa0c0199 (patch)
treefef3a27779d69b74481b1178fc02bd628a6d44da /gnu/packages/patches/libexpected-nofetch.patch
parent8a8bd15bfa640e2a377f44ab1c59c5be0c525f86 (diff)
downloadguix-4884ee6dd4b1694a4a502dd8058d6c61fa0c0199.tar.gz
gnu: libexpected: Update to 1.1.0.
* gnu/packages/patches/libexpected-use-provided-catch2.patch: Add new patch.
* gnu/packages/patches/libexpected-nofetch.patch: Remove unused patch.
* gnu/local.mk (dist_patch_DATA): Register changes.
* gnu/packages/cpp.scm (libexpected): Update to 1.1.0, and use new patch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches/libexpected-nofetch.patch')
-rw-r--r--gnu/packages/patches/libexpected-nofetch.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/gnu/packages/patches/libexpected-nofetch.patch b/gnu/packages/patches/libexpected-nofetch.patch
deleted file mode 100644
index e1d104f6f4..0000000000
--- a/gnu/packages/patches/libexpected-nofetch.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Disable FetchContent module
- No online operations are permitted during build package.
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Wed, 22 Jan 2020 21:51:33 +0300
-
-Modified by Brett Gilio <brettg@gnu.org> on Dec 5, 2020
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,16 +4,7 @@ project(tl-expected VERSION 1.0.0 LANGUAGES CXX)
- 
- option(EXPECTED_ENABLE_TESTS "Enable tests." ON)
- 
--include(FetchContent)
--FetchContent_Declare(

--  tl_cmake

--  GIT_REPOSITORY https://github.com/TartanLlama/tl-cmake.git

--)
--FetchContent_GetProperties(tl_cmake)

--if(NOT tl_cmake_POPULATED)

--  FetchContent_Populate(tl_cmake)

--  set(CMAKE_MODULE_PATH ${tl_cmake_SOURCE_DIR} ${CMAKE_MODULE_PATH})

--endif()
-+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/tl-cmake ${CMAKE_MODULE_PATH})
- include(add-tl)
- 
- tl_add_library(expected SOURCES