From patchwork Thu Dec 23 23:04:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reily Siegel X-Patchwork-Id: 35617 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 0413827BBEB; Thu, 23 Dec 2021 23:05:46 +0000 (GMT) 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 7C49B27BBEA for ; Thu, 23 Dec 2021 23:05:45 +0000 (GMT) Received: from localhost ([::1]:43052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0X9c-0004v3-LF for patchwork@mira.cbaines.net; Thu, 23 Dec 2021 18:05:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0X96-0004pn-EE for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0X8z-0003cx-U8 for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0X8z-0003Yn-Pr for guix-patches@gnu.org; Thu, 23 Dec 2021 18:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48735] [PATCH v2 08/10] gnu: Add clojure-tools-deps-alpha. Resent-From: Reily Siegel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 23:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48735@debbugs.gnu.org Received: via spool by 48735-submit@debbugs.gnu.org id=B48735.164030069613595 (code B ref 48735); Thu, 23 Dec 2021 23:05:05 +0000 Received: (at 48735) by debbugs.gnu.org; 23 Dec 2021 23:04:56 +0000 Received: from localhost ([127.0.0.1]:35194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0X8p-0003X6-TJ for submit@debbugs.gnu.org; Thu, 23 Dec 2021 18:04:56 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:25914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0X8m-0003WP-8Q for 48735@debbugs.gnu.org; Thu, 23 Dec 2021 18:04:52 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4JKm3y6YWdzQk9v for <48735@debbugs.gnu.org>; Fri, 24 Dec 2021 00:04:46 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reilysiegel.com; s=MBO0001; t=1640300686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=haARUKdzAVOtVdrpe9Zeks1pD8tx8u4s0dtt2HqwSxc=; b=1pcB/qZkyJ3m5+NEJizSYlmK0+g8tZpe43lx+cBUE/F2CPOzzineVKc/tjpvMt0QPyhHFH z0WJXmEobXYqj89n0kZipUhuwV3eqx8eI+bndGmm4+OtMXwER+kIAVOAudU6LCHlnwod+M uiExgNnQlW+31hK5OhFaHUb4mri45bsrVWwidv5CA7vIV8nwx/83JIh4aLlkILvMQGeJB2 YrpXg9CTdVG7zetb8QkjQ0FGVJWk1USYaz3T3DTQevgIWfJ1NrH2xBGAUuxd4/thUO0A86 xlDy0EyFaClWHCJuwXFmhX5lTnJm5M8huvaFhmkSV+4SEpppC8TGz2kHOQU7SQ== From: Reily Siegel In-Reply-To: <8013f2e778c737447d6f362ca4233b19f5831a21.1640300654.git.mail@reilysiegel.com> References: Message-Id: Date: Thu, 23 Dec 2021 18:04:43 -0500 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/clojure.scm (clojure-tools-deps-alpha): New variable. --- gnu/packages/clojure.scm | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 45865bd4e1..11efa89741 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -23,6 +23,7 @@ (define-module (gnu packages clojure) #:use-module (gnu packages) #:use-module (gnu packages java) + #:use-module (gnu packages maven) #:use-module (gnu packages version-control) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -430,6 +431,67 @@ (define-public clojure-tools-cli work with command-line arguments.") (license license:epl1.0))) +(define-public clojure-tools-deps-alpha + (package + (name "clojure-tools-deps-alpha") + (version "0.12.1104") + (home-page "https://github.com/clojure/tools.deps.alpha") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "174m83n5m3arai2vbg434zjibbsr3r4pp7lz3adja8lxq7g21r80")))) + (build-system clojure-build-system) + (arguments + `(#:source-dirs '("src/main/clojure" "src/main/resources") + #:test-dirs '("src/test/clojure") + #:doc-dirs '() + #:tests? #f + #:phases + (modify-phases %standard-phases + ;; FIXME: Currently, the S3 transporter depends on ClojureScript, + ;; which is very difficult to package due to dependencies on Java + ;; libraries with non-standard build systems. Instead of actually + ;; packaging these libraries, we just remove the S3 transporter that + ;; depends on them. + (add-after 'unpack 'remove-s3-transporter + (lambda _ + (for-each delete-file + (list + (string-append + "src/main/clojure/clojure/" + "tools/deps/alpha/util/s3_aws_client.clj") + (string-append + "src/main/clojure/clojure/" + "tools/deps/alpha/util/s3_transporter.clj") + (string-append + "src/test/clojure/clojure/" + "tools/deps/alpha/util/test_s3_transporter.clj"))) + (substitute* + "src/main/clojure/clojure/tools/deps/alpha/util/maven.clj" + (("clojure.tools.deps.alpha.util.s3-transporter") + ""))))))) + (propagated-inputs (list maven-resolver-api + maven-resolver-spi + maven-resolver-impl + maven-resolver-util + maven-resolver-connector-basic + maven-resolver-provider + maven-core + maven-resolver-transport-http + maven-resolver-transport-file + clojure-tools-gitlibs + clojure-tools-cli + clojure-data-xml)) + (synopsis "Clojure library supporting clojure-tools") + (description "A functional API for transitive dependency graph expansion and +the creation of classpaths.") + (license license:epl1.0))) + (define-public clojure-tools-gitlibs (package (name "clojure-tools-gitlibs")