From patchwork Fri Apr 23 14:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28820 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 3861527BC7D; Fri, 23 Apr 2021 15:33:16 +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 D48BF27BC7C for ; Fri, 23 Apr 2021 15:33:14 +0100 (BST) Received: from localhost ([::1]:41274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwrp-00035y-U6 for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwre-00035i-Kp for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwre-0005MF-DF for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwre-00076u-6y for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 1/6] gnu: Add boost-for-irods. References: <878s59qe0b.fsf@elephly.net> In-Reply-To: <878s59qe0b.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:02 +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.161918834227219 (code B ref 47972); Fri, 23 Apr 2021 14:33:02 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:22 +0000 Received: from localhost ([127.0.0.1]:38444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwqt-00074h-1W for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:22 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21149) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwqr-00074Y-Ic for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:14 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188330; cv=none; d=zohomail.com; s=zohoarc; b=Li2lNLmBR1+j8YfGMkpr36N6zO816fYJY1BybulB0xQNrCYu2Ys4gxM09HhSSNf2fPv+Jeuoq/TwZloFXgUmh9499hlNEmYRwi3BUTTFkM6xM0Lp2NeVsu1cbeODPfDkYu3OziHdiEZXq+a5w+1t+CrDkLNHyCDIXvHzA5zniMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188330; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=uITkuPX9azIr+9MwMETzafoEIDf3XmcsN4srDoE2Ep8=; b=Exj6kE1/P3aHyGtptdETQO4eYvvqsUbXlOgqIIggo5rviPUGUZfUfb7Y0vCZ19cmth0kynSzMGdOvjYgZ4JLP7VaNIqPs5fuHVM4xQVCbPjWdT64y5iWiR6Qsf3CXOch5RKZ5FsLulqcwa5hZhauO1uLMeI5wo/RrMXnbQT/15Y= 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=1619188330; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=uITkuPX9azIr+9MwMETzafoEIDf3XmcsN4srDoE2Ep8=; b=cShXu0JPy7yKqD/ubbjqfI54xs+4JqdRHwkaFIMBjjtddIx6nWE6d+6398osfkcF Y2BAb8JcnCy0BOaSHUdaEIiaSgwzYmE82+1hc/G3Kblw4omp9aC4EUxEsOz2hLYiQ+b e3C4mPaYLSLK5NeOHXepCt88CGjTz1iPpJGIdDiY= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 161918832777828.881278899562403; Fri, 23 Apr 2021 07:32:07 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:56 +0200 Message-Id: <20210423143201.12831-1-rekado@elephly.net> X-Mailer: git-send-email 2.31.1 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/boost.scm (boost-for-irods): New variable. --- gnu/packages/boost.scm | 94 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a59bb01f3d..0ab62a4d90 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Arun Isaac -;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe @@ -43,6 +43,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages hurd) #:use-module (gnu packages icu4c) + #:use-module (gnu packages llvm) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages shells) @@ -201,6 +202,97 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) +;; Sadly, this is needed for irods. It won't link with 1.69 or later. +(define-public boost-for-irods + (package + (name "boost-for-irods") + (version "1.68.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/boost/boost/" version "/boost_" + (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) + ".tar.bz2")) + (sha256 + (base32 + "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")))) + (build-system gnu-build-system) + (inputs + `(("icu4c" ,icu4c) + ("zlib" ,zlib))) + (native-inputs + `(("clang" ,clang-6) + ("libcxx" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("perl" ,perl) + ("tcsh" ,tcsh))) + (arguments + `(#:tests? #f + #:make-flags + (list "threading=multi" "link=shared" + "cxxflags=-stdlib=libc++" + "--without-python" + + ;; Set the RUNPATH to $libdir so that the libs find each other. + (string-append "linkflags=-stdlib=libc++ -Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (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"))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((icu (assoc-ref inputs "icu4c")) + (zlib (assoc-ref inputs "zlib")) + (out (assoc-ref outputs "out"))) + (substitute* '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/src/engine/execunix.c" + "tools/build/src/engine/Jambase" + "tools/build/src/engine/jambase.c") + (("/bin/sh") (which "sh"))) + + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + + (invoke "./bootstrap.sh" + (string-append "--prefix=" out) + ;; Auto-detection looks for ICU only in traditional + ;; install locations. + (string-append "--with-icu=" icu) + "--with-toolset=clang")))) + (replace 'build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((zlib (assoc-ref inputs "zlib"))) + (apply invoke "./b2" + (format #f "-j~a" (parallel-job-count)) + make-flags)))) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "./b2" "install" make-flags)))))) + (home-page "https://www.boost.org") + (synopsis "Peer-reviewed portable C++ source libraries") + (description + "A collection of libraries intended to be widely useful, and usable +across a broad spectrum of applications.") + (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" + "Some components have other similar licences.")))) + (define-public boost-with-python2 (package/inherit boost (name "boost-python2") From patchwork Fri Apr 23 14:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28822 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 8C2F627BC7C; Fri, 23 Apr 2021 15:33:22 +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 EFB0127BC7C for ; Fri, 23 Apr 2021 15:33:21 +0100 (BST) Received: from localhost ([::1]:41654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwrx-0003H4-6q for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrf-00035p-F3 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55147) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrf-0005MJ-7X for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwre-000772-M6 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 2/6] gnu: Add snappy-with-clang6. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:02 +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.161918834727242 (code B ref 47972); Fri, 23 Apr 2021 14:33:02 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:27 +0000 Received: from localhost ([127.0.0.1]:38448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr0-00074y-GC for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:27 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwqw-00074l-T2 for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:19 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188336; cv=none; d=zohomail.com; s=zohoarc; b=ROwx4FNvqsOy4+uVCgUxoDVjjYtNFQo7A5+KYoKrgsRIw89z2emUxDJUeq813gKqyExptagJik+J7hij801GRdchYMxu0D2w1y8KVNtVLHJW/MESxFxmX/ebYLOvzK4WDjjjpNvftTzSJRDMz2clV/JB04+yc63vMsfIwSbyNRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188336; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=PQiL4rV/5dSqdjclPECF78Ka9WHKTeSZZr3TccpTBdk=; b=AH64/bUBDRKBR6hlOFV65em/zAxu1PbpUjgglMa9hd+KbACKAzQUaTwPGNSMKupJ2c2hMlepqswx0o+ial6DX0g2sDbJgU5/k+r0Aor4DCo3aZOpi4fuwLBEAn8gDF5bFlbg9QDN3G9+iSZftfjzttzf3+rtDe9FrWiwSUXPagk= 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=1619188336; 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=PQiL4rV/5dSqdjclPECF78Ka9WHKTeSZZr3TccpTBdk=; b=dkLG6kxZcgB8HVwekSKNQg7TcXKWAaUm9i94j3uzbPTMog3fN2WR1FK1u3yreGee xSWAjb1vmWOPbdpeF3Z+70ZZrkokZwD/O60TG5+4RDI6horzRzNmdT9J7I2C9/Z5XP7 1JkPabklDS1/HwvOF4G+tETQsUeDvUV8jF0hAqEk= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188333612606.6808557549767; Fri, 23 Apr 2021 07:32:13 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:57 +0200 Message-Id: <20210423143201.12831-2-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/compression.scm (snappy-with-clang6): New variable. --- gnu/packages/compression.scm | 37 +++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 37a7d230fe..2b1dfcfab1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner @@ -76,6 +76,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages perl) @@ -1132,6 +1133,40 @@ for most inputs, but the resulting compressed files are anywhere from 20% to 100% bigger.") (license license:asl2.0))) +;; We need this for irods. +(define-public snappy-with-clang6 + (package + (inherit snappy) + (name "snappy-with-clang") + (arguments + `(#: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+libcxxabi") + "/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 + `(("clang" ,clang-toolchain-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6))))) + (define-public p7zip (package (name "p7zip") From patchwork Fri Apr 23 14:31:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28824 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 D629F27BC7D; Fri, 23 Apr 2021 15:33:42 +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 5509127BC7C for ; Fri, 23 Apr 2021 15:33:42 +0100 (BST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwsH-0003VO-IK for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrg-00035x-D5 for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrg-0005My-64 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 1lZwrf-00077B-It for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 3/6] gnu: Add nanodbc-for-irods. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:03 +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.161918834727249 (code B ref 47972); Fri, 23 Apr 2021 14:33:03 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:27 +0000 Received: from localhost ([127.0.0.1]:38451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr5-00075L-58 for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:27 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr0-00074u-4p for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:22 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188340; cv=none; d=zohomail.com; s=zohoarc; b=Ra2VTQpWRF71Ffl7FgJOdpJ4qOL8/FMUgUxd1y7IXgDOg5snounkThB2Vhz16wGX4y/CyvmNmQ4xttP61IhyQo7JqKw4bN7Rdw9jAQIOsKIzSnN9CJFDvzmRnGC1sd0XD1vJA1xDBhhTGy2RRdTIyBPkKA2WFzaUkCqrJMG0pas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=dUBFcNhnsWXFC4xRYfYiuqnL908bflnx7XDwg7MdHaI=; b=DNdzuzzjyIGBwFfCTYaTjSheXqohtuF4FAzOAHZyB+3COLeOz8qmx2uFvQTyPYFki4pKqe2L2aNBDwKNC4ZFtid4x8bJDFe9YuARBVVqCO8w5/7z+E8I18wjpagY1GG29sLATkBLRv5UzrRVhJDhiF3g1QMY9jFINZ3s5ECLQZU= 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=1619188340; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=dUBFcNhnsWXFC4xRYfYiuqnL908bflnx7XDwg7MdHaI=; b=FGgxExxp/1SWy2dtsjdIq7TOPf7LMboEZPNA9YqEuWMMRSamBJxKaEEXvLwMi9pz BEVNxABFhIxwZfNh/fp7QGhOY5ugyqeQWg9GX1vQWaVJ4cJBYcjTGE4v28BVCbWwcGG Dv9AG59HQWQwxgvhCaqV1WRGeBSi/arg7E5ajLEg= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188337741433.1769107096393; Fri, 23 Apr 2021 07:32:17 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:31:58 +0200 Message-Id: <20210423143201.12831-3-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/databases.scm (nanodbc-for-irods): New variable. --- gnu/packages/databases.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b956833557..d159c47af8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -98,6 +98,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -2103,6 +2104,42 @@ a simpler and less verbose API for working with ODBC. Common tasks should be easy, requiring concise and simple code.") (license license:expat))) +(define-public nanodbc-for-irods + (package + (inherit nanodbc) + (arguments + `(#:tests? #false + #:configure-flags + '("-DBUILD_SHARED_LIBS=ON" + ;; The tests require ODBC backends to be installed. + "-DNANODBC_DISABLE_TESTS=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")))))))) + (inputs + `(("unixodbc" ,unixodbc) + ("libcxx" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("clang" ,clang-6))))) + (define-public unqlite (package (name "unqlite") 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") From patchwork Fri Apr 23 14:32:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28823 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 1E71527BC7C; Fri, 23 Apr 2021 15:33:25 +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 DD08E27BC7D for ; Fri, 23 Apr 2021 15:33:23 +0100 (BST) Received: from localhost ([::1]:41764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwrz-0003Jn-4M for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrh-00036X-7V for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrg-0005NP-VR 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-00077T-SC for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 5/6] gnu: Add 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.161918835927290 (code B ref 47972); Fri, 23 Apr 2021 14:33:04 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:39 +0000 Received: from localhost ([127.0.0.1]:38456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwrA-00075o-83 for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:38 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwr8-00075a-CA for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:31 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188346; cv=none; d=zohomail.com; s=zohoarc; b=Qfa2cORkOx1ItpjsmodN5FRM5cKMYFAlMi5leX4+QddL8ngc1aWSDvah4ligci9x+P4Dlu2fUQPEUrT9gpHap46uDaSa58k7jhwqx1MjdnA3D87fAP3zxDVg2jyDjuLYDYVbevMQj25BxSitcj9eYZaWMmUeCXMaRl73eMX4ClY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188346; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gt+C9GUyNWFrR+5R9BUUCVD0RSS7SL/QmnaTF7dxuLE=; b=cm/1lOe6hL6mhfVCsuN3iLlCYleVCZnEFztlycbqhohoLSj1IwyhVyb179NLZZszircFZYStZWXShvJeEWFtxdH2V3o8TrixWxpYOKWru9tTa5o6Li8OF206duhEpxuwev5tVgOpmpxET+1/Tja+0nfMzf4kImHi3FJz9togH6k= 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=1619188346; 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=gt+C9GUyNWFrR+5R9BUUCVD0RSS7SL/QmnaTF7dxuLE=; b=Bkc4CIarxDH6TftrqmK1fhjn6z6gWjJ+WSJrlvv+of/E4MtVi4oE2Aiqnxdj6rHR J5gr75QxS2OaBRQ3srggc/gJakk4H3nqIN4PGeeBmM+rvCWq9YiuOjuQt2SGaV8Q+Y2 6rEf8+CLWE9bIMA2z8cl7TEx4I22MXxJxgU34Lnk= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 1619188344380985.5269616705542; Fri, 23 Apr 2021 07:32:24 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:32:00 +0200 Message-Id: <20210423143201.12831-5-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/irods.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/irods.scm | 200 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 gnu/packages/irods.scm diff --git a/gnu/local.mk b/gnu/local.mk index 50b11a8ca2..f18fed6fbc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -296,6 +296,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/installers.scm \ %D%/packages/ipfs.scm \ %D%/packages/irc.scm \ + %D%/packages/irods.scm \ %D%/packages/iso-codes.scm \ %D%/packages/jami.scm \ %D%/packages/java.scm \ diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm new file mode 100644 index 0000000000..75a58d97cb --- /dev/null +++ b/gnu/packages/irods.scm @@ -0,0 +1,200 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Ricardo Wurmus +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages irods) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system cmake) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages backup) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) + #:use-module (gnu packages databases) + #:use-module (gnu packages gcc) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) + #:use-module (gnu packages logging) + #:use-module (gnu packages networking) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages python) + #:use-module (gnu packages serialization) + #:use-module (gnu packages tls) + #:use-module (srfi srfi-1)) + +(define-public irods + (package + (name "irods") + (version "4.2.8") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/irods/irods/releases/download/" + version "/irods-" version ".tar.gz")) + (sha256 + (base32 + "0ny54c3r0j692rvbr4iibg7xgd2i7g9x8yyrw04j889bywix14rc")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list + "-DCMAKE_BUILD_TYPE=Release" + (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + + ;; Configuration aborts if no generator format is set + "-DCPACK_GENERATOR=TGZ" + + ;; Configuration attempts to guess the distribution with Python. + "-DIRODS_LINUX_DISTRIBUTION_NAME=guix" + "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1" + + (string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG=" + (assoc-ref %build-inputs "clang")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=" + (assoc-ref %build-inputs "clang-runtime")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=" + (assoc-ref %build-inputs "cppzmq")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=" + (assoc-ref %build-inputs "libarchive")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_AVRO=" + (assoc-ref %build-inputs "avro-cpp")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_BOOST=" + (assoc-ref %build-inputs "boost")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_ZMQ=" + (assoc-ref %build-inputs "zeromq")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_JSON=" + (assoc-ref %build-inputs "json")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_CATCH2=" + (assoc-ref %build-inputs "catch2")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_NANODBC=" + (assoc-ref %build-inputs "nanodbc")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_FMT=" + (assoc-ref %build-inputs "fmt"))) + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unset-Werror + (lambda _ + ;; -Werror kills the build due to a comparison REQUIRE(errs.size() == err->len); + ;; in unit_tests/src/test_irods_lifetime_manager.cpp + (substitute* "CMakeLists.txt" + (("-Werror") "")))) + (add-after 'unpack 'remove-FHS-and-prefix-assumptions + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("CMakeLists.txt" + "cmake/server.cmake" + "cmake/development_library.cmake" + "cmake/runtime_library.cmake") + (("usr/") "")) + (substitute* "lib/core/src/irods_default_paths.cpp" + (("path.append\\(\"usr\"\\)") "path") + (("path.remove_filename\\(\\).remove_filename\\(\\).remove_filename\\(\\)") + "path.remove_filename().remove_filename()")) + (substitute* "scripts/irods/paths.py" + (("'usr', 'lib', 'irods'") "'lib', 'irods'")) + (substitute* "scripts/irods/pypyodbc.py" + (("\"/usr/lib/libodbc.so\"") + (string-append (assoc-ref inputs "unixodbc") "/lib/libodbc.so"))))) + (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+libcxxabi") + "/include/c++/v1") + (string-append (assoc-ref inputs "catch2") + "/include/catch2") + (string-append (assoc-ref inputs "json") + "/include/nlohmann") + ;; 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")))))))) + (inputs + `(("avro-cpp" ,(package + (inherit avro-cpp-1.9) + (arguments + `(#:configure-flags + '("-DCMAKE_CXX_COMPILER=clang++" + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi -lz") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lang/c++"))) + (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+libcxxabi") + "/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")))))))) + (inputs + `(("boost" ,boost-for-irods) + ("clang" ,clang-toolchain-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("snappy" ,snappy-with-clang6) + ("zlib" ,zlib))))) + ("boost" ,boost-for-irods) + ("cppzmq" ,cppzmq) + ("fmt" ,fmt-for-irods) + ("json" ,json-modern-cxx) + ("libarchive" ,libarchive) + ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi + ("linux-pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) + ("nanodbc" ,nanodbc-for-irods) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("unixodbc" ,unixodbc) + ("zeromq" ,zeromq))) + (native-inputs + `(("catch2" ,catch-framework2) + ("clang" ,clang-toolchain-6) + ("clang-runtime" ,clang-runtime-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6))) + (home-page "https://irods.org") + (synopsis "Data management software") + (description "The Integrated Rule-Oriented Data System (iRODS) is data +management software. iRODS virtualizes data storage resources, so users can +take control of their data, regardless of where and on what device the data is +stored.") + (license license:bsd-3))) From patchwork Fri Apr 23 14:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 28825 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 1163B27BC7D; Fri, 23 Apr 2021 15:33:50 +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 1601F27BC7C for ; Fri, 23 Apr 2021 15:33:49 +0100 (BST) Received: from localhost ([::1]:42710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwsO-0003j7-8s for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 10:33:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZwrh-000370-Kk for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZwrh-0005Nx-BW for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZwrh-00077a-8u for guix-patches@gnu.org; Fri, 23 Apr 2021 10:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47972] [PATCH 6/6] gnu: Add irods-client-icommands. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 14:33:05 +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.161918835927297 (code B ref 47972); Fri, 23 Apr 2021 14:33:05 +0000 Received: (at 47972) by debbugs.gnu.org; 23 Apr 2021 14:32:39 +0000 Received: from localhost ([127.0.0.1]:38459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwrH-000767-1R for submit@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:39 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZwrA-00075k-E5 for 47972@debbugs.gnu.org; Fri, 23 Apr 2021 10:32:32 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1619188350; cv=none; d=zohomail.com; s=zohoarc; b=n6h6V+gJSrCMkHHIcRYFmF4/YlhAKzs0Dm0tcEgE8m9HxsXgAqWDtywgkJYrUCEnQ5QTqjWTOoe/lvvQ93zXUzo/U44BKx/PWuckPG8G421yYt3MzjRbKRc7onzm2WSHpZspb1wnVLT9MZtOlyZC0PVQSs0nF8Yc3rcleRjg0Kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619188350; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VCm//WeS/VyIqffVFAcaWuGEZMSkJLMENXcAfey9GQ0=; b=UklofG4rLt+UOVRRysIrQFMlU/SsAyLRKUCKrvxbNhOyqpcLbIHUSchIJ/DVCcRNEokSwwt6WXgnvom5/YpfZUXW8mKN0ff/VupR+Hw/uvV91XYF5FP83E6HwTiQvQS3ZlDGEr94ExRWKDmehcdevLnaaWkMOrg369WTh9I92iU= 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=1619188350; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=VCm//WeS/VyIqffVFAcaWuGEZMSkJLMENXcAfey9GQ0=; b=XJwhoB7OqbBEqRuASKX9e4BRXdPtSnFsPEgMokhjF/qx3lzDAS4L+TBlCIwGImhu xrCFnWgUpbjCROwI8DvRvXmJ2FCissBGmyC3XOmgepZK96zuOyZMaw4lYVNlIUypRNp KhcDHceAAFjrzSGvEHiI48S73SrZKbYLy6Cw2aeI= Received: from localhost (p54ad4fb3.dip0.t-ipconnect.de [84.173.79.179]) by mx.zohomail.com with SMTPS id 161918834780511.043410864519274; Fri, 23 Apr 2021 07:32:27 -0700 (PDT) From: Ricardo Wurmus Date: Fri, 23 Apr 2021 16:32:01 +0200 Message-Id: <20210423143201.12831-6-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/irods.scm (irods-client-icommands): New variable. --- gnu/packages/irods.scm | 137 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm index 75a58d97cb..e757c1d80a 100644 --- a/gnu/packages/irods.scm +++ b/gnu/packages/irods.scm @@ -20,10 +20,12 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages backup) + #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -34,6 +36,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages logging) + #:use-module (gnu packages man) #:use-module (gnu packages networking) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) @@ -198,3 +201,137 @@ management software. iRODS virtualizes data storage resources, so users can take control of their data, regardless of where and on what device the data is stored.") (license license:bsd-3))) + +(define-public irods-client-icommands + (package + (name "irods-client-icommands") + (version "4.2.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/irods/irods_client_icommands") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "069n647p5ypf44gim8z26mwayg5lzgk7r9qyyqd8f9n7h0p4jxpn")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #false ; not clear how to run tests + #:configure-flags + (list + "-DCMAKE_BUILD_TYPE=Release" + + ;; Configuration attempts to guess the distribution with Python. + "-DIRODS_LINUX_DISTRIBUTION_NAME=guix" + "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1" + + (string-append "-DIRODS_DIR=" + (assoc-ref %build-inputs "irods") + "/lib/irods/cmake") + (string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG=" + (assoc-ref %build-inputs "clang")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=" + (assoc-ref %build-inputs "clang-runtime")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=" + (assoc-ref %build-inputs "cppzmq")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_ARCHIVE=" + (assoc-ref %build-inputs "libarchive")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_AVRO=" + (assoc-ref %build-inputs "avro-cpp")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_BOOST=" + (assoc-ref %build-inputs "boost")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_ZMQ=" + (assoc-ref %build-inputs "zeromq")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_JSON=" + (assoc-ref %build-inputs "json")) + (string-append "-DIRODS_EXTERNALS_FULLPATH_FMT=" + (assoc-ref %build-inputs "fmt"))) + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unset-Werror ; + (lambda _ ; + ;; -Werror kills the build due to a deprecation warning + (substitute* "CMakeLists.txt" ; + (("-Werror") "")))) + (add-after 'unpack 'remove-/usr-prefix + (lambda _ + (substitute* "CMakeLists.txt" + (("usr/") "")))) + (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+libcxxabi") + "/include/c++/v1") + (string-append (assoc-ref inputs "json") + "/include/nlohmann") + ;; 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")))))))) + (inputs + `(("avro-cpp" ,(package + (inherit avro-cpp-1.9) + (arguments + `(#:configure-flags + '("-DCMAKE_CXX_COMPILER=clang++" + "-DCMAKE_CXX_FLAGS=-stdlib=libc++" + "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi -lz") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lang/c++"))) + (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+libcxxabi") + "/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")))))))) + (inputs + `(("boost" ,boost-for-irods) + ("clang" ,clang-toolchain-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6) + ("libcxxabi" ,libcxxabi-6) + ("snappy" ,snappy-with-clang6) + ("zlib" ,zlib))))) + ("boost" ,boost-for-irods) + ("cppzmq" ,cppzmq) + ("fmt" ,fmt-for-irods) + ("irods" ,irods) + ("json" ,json-modern-cxx) + ("libarchive" ,libarchive) + ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi + ("mit-krb5" ,mit-krb5) + ("openssl" ,openssl) + ("zeromq" ,zeromq))) + (native-inputs + `(("clang" ,clang-toolchain-6) + ("clang-runtime" ,clang-runtime-6) + ("libcxx+libcxxabi" ,libcxx+libcxxabi-6) + ("help2man" ,help2man) + ("which" ,which))) + (home-page "https://irods.org") + (synopsis "Data management software") + (description "The Integrated Rule-Oriented Data System (iRODS) is data +management software. iRODS virtualizes data storage resources, so users can +take control of their data, regardless of where and on what device the data is +stored.") + (license license:bsd-3)))