From patchwork Fri Apr 23 14:31:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28821 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 39EFA27BC7D; Fri, 23 Apr 2021 15:33:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C46727BC7C for ; Fri, 23 Apr 2021 15:33:16 +0100 (BST) Received: from localhost ([::1]:41328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwrr-000385-KN for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrg-000366-Pk for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrg-0005N3-If for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwrg-00077L-Fo for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 4/6] gnu: Add fmt-for-irods. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47972@debbugs.gnu.org Cc: Ricardo Wurmus Received: via spool by 47972-submit@debbugs.gnu.org id=B47972.161918835227271 (code B ref 47972); Fri, 23 Apr 2021 14:33:04 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:32 +0000 Received: from localhost ([127.0.0.1]:38453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr5-00075S-FI for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:32 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr2-00075B-GR for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:25 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188342; cv=none; d=zohomail.com; s=zohoarc; b=PuLqvyK3arajmm0Ln2rYJQnML50Z0xRskidgNE+XGoHzvMBvNl4h3jl/yF09NnIp0DnZEHE4gMF7gqcwbgiT7zIZAMEYs7OnRt+VXwecP1UNuaOANG6cELG9Xp+LRYbs64hBjLtBEc07GqkeEj+WtSNtM5vQAVYqnfn+AjN7stU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188342; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=xZTplBA3fMT3Gus2KHAsrBBhWLojauK3yv8FK+vHfos=; b=WD6Z+HyrX0dezIlKRkh05IYuhbHJQ+3kJPZsZqQQX8qGOdzLkkc8Nbx8wbzodRM9MQTUFnxb5UC0CoWeYgvZxWNWYXOBN1OtYAS6VNg6l/sZ1LqH9mzBVS+MhsMElO7tooxfMRTAAKMclcBqmaLmZ1nJ82e5h043TF/ShuSx2SQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1619188342; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=xZTplBA3fMT3Gus2KHAsrBBhWLojauK3yv8FK+vHfos=; b=ZbRshkQjnvCLz8bp9ZgsBfIvIWLAysZ3Dj2NQMmvOHV5y0EDMJ5K+9EuYM3zqhx2 kP32VbEuQdwEwpdPDSnAxMnqgQBH8CT/FtJZX/G12zuta8Ez1OmUUzk8S4uhqSkITc4 Dy/PAq2UHjds8bC6P6qXVWvROj91MXC43r7WHopA= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188341067622.9332547598373; Fri, 23 Apr 2021 07:32:21 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:59 +0200 Message-Id: <20210423143201.12831-4-rekado@elephly.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210423143201.12831-1-rekado@elephly.net> References: <20210423143201.12831-1-rekado@elephly.net> MIME-Version: 1.0 X-ZohoMailClient: External 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pretty-print.scm (fmt-for-irods): New variable. --- gnu/packages/pretty-print.scm | 55 ++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 4662a1e717..7e7da53599 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2019, 2020 Efraim Flashner -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2021 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2020 Ludovic Courtès ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice @@ -41,6 +41,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages gv) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -189,6 +190,58 @@ to @code{IOStreams}.") ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) +(define-public fmt-for-irods + (package + (name "fmt-for-irods") + (version "6.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; TODO: posix-mock-test segfaults + #:configure-flags + '("-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_CXX_COMPILER=clang++" + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi") + #:phases + (modify-phases %standard-phases + (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (cons (string-append (assoc-ref inputs "libcxx") + "/include/c++/v1") + ;; Hide GCC's C++ headers so that they do not interfere with + ;; the Clang headers. + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:))) + ":")) + (format #true + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH")))))))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("libcxx" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("clang" ,clang-6))) + (home-page "https://fmt.dev") + (synopsis "Small and fast C++ formatting library") + (description + "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++. +It can be used as a safe alternative to @code{printf} or as a fast alternative +to @code{IOStreams}.") + ;; The library is bsd-2, but documentation and tests include other licenses. + (license (list bsd-2 bsd-3 psfl)))) + (define-public source-highlight (package (name "source-highlight")