From patchwork Sun Jun 18 20:53:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51064 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7627127BBEC; Sun, 18 Jun 2023 21:54:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B8E5027BBE2 for ; Sun, 18 Jun 2023 21:54:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPQ-0006cZ-OW; Sun, 18 Jun 2023 16:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAzPP-0006bk-Hl for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAzPP-0002Ej-97 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPP-0007Sv-62 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 5/8] gnu: Add tl-optional. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162728623 (code B ref 64137); Sun, 18 Jun 2023 20:54:03 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:47 +0000 Received: from localhost ([127.0.0.1]:55049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP9-0007Ra-Ed for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP2-0007QP-2b for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:40 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8996C240027 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121614; bh=t4PqVAU4/RYledQgLgyXA41uX3umwBHAfcLa57QAhuE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=GcDUW4gQhXyAGQ87Ylu4Bf1iix3d8eOLVSecdDD7n5Td9KOjaKb6YWJtIb4H9b1jF 1ZOhjTnKbm40rsXE74dtnLqWlp7+FtEJQPi2E2to3aOeLWk+Oe7wexdGLBWUc+is43 02R4UpjqWO8WrMKzkd+U4wh6WKhbmqAAiDF60Ije6UrDvxmnJbk/wnhn1yXa2aP+K5 2Ehf7SvXRjD64f43v9Rv7nyBqDeM83nJWayGqhCTzGchE4MP6eOdVZz53xRrrJQ6K/ oNkvxIqtIYxgTlvRRgeANySSTvrpXd+davXQyEU+Jt+kjMba3x9z42yzYoCjUDZ8Q5 S/cS0nsMq+YCA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVQ15d2z9rxN; Sun, 18 Jun 2023 22:53:34 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:04 +0000 Message-Id: <3a83b2cb978fa59ec7c3b17517f9ea7c77eded28.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (tl-optional): New variable. --- gnu/packages/cpp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f1d7e89537..2fe7f477ce 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2691,3 +2691,35 @@ (define-public tsl-ordered-map (description "This package provides a C++ implementation of a hash map and a hash set which preserve the order of insertion.") (license license:expat))) + +(define-public tl-optional + (package + (name "tl-optional") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TartanLlama/optional") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qkjplmhilbi1iqxx3pz0grcx5355ymk6wwd4h4309mk156xgx2q")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-test + (lambda _ + (substitute* "CMakeLists.txt" + (("FetchContent_Declare.*") "") + ((".*http.*catchorg/Catch2.*") "") + (("FetchContent_MakeAvailable\\(Catch2\\)") + "find_package(Catch2 REQUIRED)"))))))) + (native-inputs (list catch2)) + (home-page "https://github.com/TartanLlama/optional") + (synopsis "C++11/14/17 implementation of std::optional with extensions") + (description "tl-optional is a single-header implementation of +std::optional with functional-style extensions and support for references.") + (license license:cc0)))