From patchwork Fri Nov 24 05:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Stan X-Patchwork-Id: 56790 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 4241C27BBE9; Fri, 24 Nov 2023 05:39:22 +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=-1.2 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_SORBS_WEB,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 A369A27BBE2 for ; Fri, 24 Nov 2023 05:39:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6Ou8-00075h-NW; Fri, 24 Nov 2023 00:39:04 -0500 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 1r6Ou2-00073j-LL for guix-patches@gnu.org; Fri, 24 Nov 2023 00:38:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6Ou2-0001lO-00 for guix-patches@gnu.org; Fri, 24 Nov 2023 00:38:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6Ou6-0005dF-7P for guix-patches@gnu.org; Fri, 24 Nov 2023 00:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67425] [PATCH] Added clojure-tools-deps package 0.18.1354 Resent-From: eugen.stan@netdava.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Nov 2023 05:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67425 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67425@debbugs.gnu.org Cc: mail@cbaines.net, Eugen Stan X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170080431921614 (code B ref -1); Fri, 24 Nov 2023 05:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2023 05:38:39 +0000 Received: from localhost ([127.0.0.1]:35482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6Oti-0005cX-Ie for submit@debbugs.gnu.org; Fri, 24 Nov 2023 00:38:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:46744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6Otg-0005cG-Tt for submit@debbugs.gnu.org; Fri, 24 Nov 2023 00:38:37 -0500 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 1r6OtW-00071P-6o for guix-patches@gnu.org; Fri, 24 Nov 2023 00:38:26 -0500 Received: from sender4-of-o50.zoho.com ([136.143.188.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6OtU-0001h5-Hq for guix-patches@gnu.org; Fri, 24 Nov 2023 00:38:25 -0500 Delivered-To: eugen.stan@netdava.com ARC-Seal: i=1; a=rsa-sha256; t=1700804300; cv=none; d=zohomail.com; s=zohoarc; b=LDrzb0mw1d8PXE7sxiFXxNHDEA9DdUT5/JkRnvomItqR5AuGIpMTnY6ejARvCTNBr/oWbnxCUicqijJuju478KsVjDmMDEEpSAoHPX4V5m+NfLoutgyq14HvT94s8/xAo4eJGitebJtCrQR2ubT67R3BoJ0TBXzcEwya2yRVyqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700804300; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=ES8SmTF6yFZ/+aPg3xseTK4ubE6RlNcvrRFjFeLeA4k=; b=O6b1Q2d//R6okHvXRLxLTzdtF0iO152tfOpgE2wi3n+V3Gva1/797QgUQNDdKMn0WIdsoDGfBbZXs46pSDPEWi2yPqVVe6c/NfXn/kjsMJLdh0IbjaiLaTs8Yu7uu3NLWSHVcbHR/oBl/JBSiqGw9ppjO7qTISJT2uTAFCrBSVI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=netdava.com; spf=pass smtp.mailfrom=eugen.stan@netdava.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1700804300; s=zohodkim; d=netdava.com; i=eugen.stan@netdava.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=ES8SmTF6yFZ/+aPg3xseTK4ubE6RlNcvrRFjFeLeA4k=; b=c7F0Ht+0RiwaTZfPoGk/HLhVPOYS/jwkobQUxxvv9dcjU5ZQGyngyj0NhIofv6Dx lPUsE6qXjXiayENJiCQBnek0lllVDhbbTx0LweucA29Mr0imWO1tE7FxS5AQIxGeR8f umgSgFWGaaVILmAulTzvDXXIzk24DLxGXuJ8GmIc= Received: from daos-495.. (84.232.142.73 [84.232.142.73]) by mx.zohomail.com with SMTPS id 170080429816227.990719379666643; Thu, 23 Nov 2023 21:38:18 -0800 (PST) From: eugen.stan@netdava.com Date: Fri, 24 Nov 2023 07:37:10 +0200 Message-Id: <20231124053710.287915-1-eugen.stan@netdava.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.50; envelope-from=eugen.stan@netdava.com; helo=sender4-of-o50.zoho.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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 From: Eugen Stan --- gnu/packages/clojure.scm | 65 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index e28998b570..b9296b3e78 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -572,7 +572,72 @@ (define-public clojure-tools-cli work with command-line arguments.") (license license:epl1.0))) +(define-public clojure-tools-deps + (package + (name "clojure-tools-deps") + (version "0.18.1354") + (home-page "https://github.com/clojure/tools.deps") + (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 + "0ls5nixhsjjhf3qz8kbyhmks5lw7a25zxl46yrizbw7vba3mzrpl")))) + (build-system clojure-build-system) + (arguments + `(#:source-dirs '("src/main/clojure" "src/main/resources") + #:test-dirs '("src/test/clojure") + #:doc-dirs '() + ;; FIXME: Could not initialize class org.eclipse.aether.transport.http.SslSocketFactory + #: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/util/s3_aws_client.clj") + (string-append + "src/main/clojure/clojure/" + "tools/deps/util/s3_transporter.clj") + (string-append + "src/test/clojure/clojure/" + "tools/deps/util/test_s3_transporter.clj"))) + (substitute* + "src/main/clojure/clojure/tools/deps/util/maven.clj" + (("clojure.tools.deps.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 "This package provides a functional API for transitive +dependency graph expansion and the creation of classpaths.") + (license license:epl1.0))) + (define-public clojure-tools-deps-alpha + ;; this was superseded by clojure-tools-deps + ;; https://github.com/clojure/tools.deps.alpha + ;; Keeping it to give downstream packages a chance to upgrade (package (name "clojure-tools-deps-alpha") (version "0.14.1212")