From patchwork Fri Feb 4 00:26:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reily Siegel X-Patchwork-Id: 36980 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 9D73427BBEA; Fri, 4 Feb 2022 00:29:07 +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,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 CA19527BBE9 for ; Fri, 4 Feb 2022 00:29:06 +0000 (GMT) Received: from localhost ([::1]:52500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFmTJ-0004im-Vs for patchwork@mira.cbaines.net; Thu, 03 Feb 2022 19:29:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFmRP-0002Ld-Po for guix-patches@gnu.org; Thu, 03 Feb 2022 19:27:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFmRK-0002Hs-VE for guix-patches@gnu.org; Thu, 03 Feb 2022 19:27:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nFmRK-0000Bs-Sq for guix-patches@gnu.org; Thu, 03 Feb 2022 19:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53765] [PATCH 16/17] gnu: clojure-tools-deps-alpha: Fix issues with S3 References: <87y22r32hi.fsf@reilysiegel.com> In-Reply-To: <87y22r32hi.fsf@reilysiegel.com> Resent-From: Reily Siegel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 00:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53765@debbugs.gnu.org Received: via spool by 53765-submit@debbugs.gnu.org id=B53765.1643934393660 (code B ref 53765); Fri, 04 Feb 2022 00:27:02 +0000 Received: (at 53765) by debbugs.gnu.org; 4 Feb 2022 00:26:33 +0000 Received: from localhost ([127.0.0.1]:58343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFmQr-0000Aa-HW for submit@debbugs.gnu.org; Thu, 03 Feb 2022 19:26:33 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:51184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFmQp-0000AJ-Vl for 53765@debbugs.gnu.org; Thu, 03 Feb 2022 19:26:32 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (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-202.mailbox.org (Postfix) with ESMTPS id 4Jqbtp2BfFz9sTF for <53765@debbugs.gnu.org>; Fri, 4 Feb 2022 01:26:26 +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=1643934384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=vbO10v3mbBrR/Gu+HvM0sDgzvbUND4oYlUj55sJpRGM=; b=MQ/q7N92URIZr7AGQnN4K/fl+tW45ia9v+M/4Wi+t2qhNbqqulWTzCGM3kwDdqQOGxj1Wv C87569EHf+kqi0YvqF4+LLHL3RHDVQ8n42nsa2sJdpUpsinDI+BDDdp0e4cAcozpKzwZH8 tu2WX3E+UF7SLvTphL42vVPIZSYvlNONk2230PiJ3y4svg7xSA3/HDjJdaf0eA5A7ZeKLV DD9PrBSyDRUZqCRlx5H+i7MMkasaxyjl1PXbAaOCKYLKAqs8jPgm+3FihZVl0AITgR/MYR 7wz9v9joI0tkNCXCl1+xUT3WtozNZYsFJz11AhWbSNe609WQJ6NxFhoa28YU7w== From: Reily Siegel Date: Thu, 03 Feb 2022 19:26:20 -0500 Message-ID: <87bkzn32ab.fsf@reilysiegel.com> 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): Remove a restriction which prevented the S3 loader from being used due to dependency issues. Now that clojure-core-async has been packaged, this restriction can be lifted. --- gnu/packages/clojure.scm | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 4979300dc7..fe10a198db 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -888,34 +888,11 @@ (define-public clojure-tools-deps-alpha (build-system clojure-build-system) (arguments `(#:source-dirs '("src/main/clojure" "src/main/resources") + #:java-source-dirs '("src/main/java") #: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/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") - ""))))))) + #:tests? #f)) (propagated-inputs (list maven-resolver-api maven-resolver-spi maven-resolver-impl @@ -927,7 +904,11 @@ (define-public clojure-tools-deps-alpha maven-resolver-transport-file clojure-tools-gitlibs clojure-tools-cli - clojure-data-xml)) + clojure-data-xml + clojure-com-cognitect-aws-api + clojure-com-cognitect-aws-endpoints + clojure-com-cognitect-aws-s3 + java-javax-inject)) (synopsis "Clojure library supporting clojure-tools") (description "This package provides a functional API for transitive dependency graph expansion and the creation of classpaths.")