From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SNbBH4DlgmChYQEAgWs5BA (envelope-from ) for ; Fri, 23 Apr 2021 17:19:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qDZ0G4DlgmAxGQAA1q6Kng (envelope-from ) for ; Fri, 23 Apr 2021 15:19:28 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E5015E563 for ; Fri, 23 Apr 2021 17:19:27 +0200 (CEST) Received: from localhost ([::1]:42710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZwsP-0003j7-4z for larch@yhetil.org; Fri, 23 Apr 2021 10:33:49 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619191168; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=VCm//WeS/VyIqffVFAcaWuGEZMSkJLMENXcAfey9GQ0=; b=scYfjSMHJ5GTdKia/W7SSbPrjvJhSnCBEfHeHMXS+inPSjGO49L8TtlFJegH6GWkaEqiv9 VEICfiXWUHoPeUMUr0konhEd2GrnN/49oVGsMQPf2NxYbn2hlV67a5mxD53pjSvecQXT2F qCam5CWH9XJGiCa8PGel//MlPmgu0FNL8IQK/h8rTPs+cQrmb+09AZd1fdaBrey/SeUrBp hVG582Lv7qPOvcJdjm33U7rKP0IT+16okxN9wvSwH22AYMLA3YVNNyvv9G4lwlKJCXXRou lOMW7ha/4pMBetSl4ujCoc3W5KAidXPbNIW+GeT4gy2zxP5snvUeMfB8dEglGQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1619191168; a=rsa-sha256; cv=fail; b=COVLbrkTT5vduYPpqTe+UgWi2OWnNIcTQDOm6jQzgfZ4GwYLy3MJZBXcXvawwx0gWdhq2c Wd1atdUUDW9cXGYMxSIVYBre3KbDdSyy21uWrwZXH/z74bi5Nr9Wb2SyRnWCiWfPaMrUdM H5puI+xE1mGJw0DaPdmSTwcyYbnwgAiPdlRHdSAVj0r8SmDMnyaoYpfrbs3NvsHn7ac3tR 2f8jaCDuF5Cj10u9JC4jx1jKtkhS7ycrJh8+KHGGNFg15/owm4SHJ7OkZOgamyA/MsyQ5Y 7GgXX4EdxEwYmBdPHhsOgcPrWKuoGd/Z46as12zEmKpA1Mvd98gmQOVtAi0VRQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=XJwhoB7O; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 5.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=XJwhoB7O; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E5015E563 X-Spam-Score: 5.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: h9UY7Hsu0xDq * 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))) -- 2.31.1