From patchwork Tue Jan 25 18:37:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reily Siegel X-Patchwork-Id: 38358 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 31F4827BBE9; Wed, 6 Apr 2022 13:42:52 +0100 (BST) 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 D4FA627BBEA for ; Wed, 6 Apr 2022 13:42:51 +0100 (BST) Received: from localhost ([::1]:32768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nc4zr-0002AV-0d for patchwork@mira.cbaines.net; Wed, 06 Apr 2022 08:42:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nc4z9-0000wF-1k for guix-patches@gnu.org; Wed, 06 Apr 2022 08:42:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nc4z8-0000qB-Nr for guix-patches@gnu.org; Wed, 06 Apr 2022 08:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nc4z8-0000M5-MQ for guix-patches@gnu.org; Wed, 06 Apr 2022 08:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53765] [PATCH v3 16/17] gnu: clojure-tools-deps-alpha: Fix issues with S3 References: <87y22r32hi.fsf@reilysiegel.com> Resent-From: Reily Siegel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Apr 2022 12:42:06 +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 Cc: Maxime Devos Received: via spool by 53765-submit@debbugs.gnu.org id=B53765.16492489191253 (code B ref 53765); Wed, 06 Apr 2022 12:42:06 +0000 Received: (at 53765) by debbugs.gnu.org; 6 Apr 2022 12:41:59 +0000 Received: from localhost ([127.0.0.1]:57297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nc4yy-0000Jy-1K for submit@debbugs.gnu.org; Wed, 06 Apr 2022 08:41:59 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:41888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nc4yw-0000Ji-5W for 53765@debbugs.gnu.org; Wed, 06 Apr 2022 08:41:54 -0400 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-103.mailbox.org (Postfix) with ESMTPS id 4KYPK82xQFz9sW5; Wed, 6 Apr 2022 14:41:48 +0200 (CEST) From: Reily Siegel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=reilysiegel.com; s=MBO0001; t=1649248906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=f8Jdm70eKvstA4fbKMU1NgokXO0i+3aDOe/V5vSjA94=; b=BxPDQjSjHGSpcuvcx43HmylcX3kXGyHcsX1FsJ3Eg1hQMLnibRvmZcdttyUOCq+gqDBLfs alPg0czuUbrmqR6jjREs7/nlh36+t6H2xAWzrwyGEXM/LzfcVCCU722e89onYfCtgEG7nC 5AP4NUDC9G2Rt+id8/YlIoPd9WKzjQfTIedYN608noxz6g9OTyyY9LR3F/GcSDjlnnsOqW 52mG7Dg8pQWltbLvshhMrYWstKLjueGLoR902DngQ8inxNN5DGIHepAmTAEQ7JkxuX3Cv+ aPF+KJWbAA/xnqUskBBp7azG5JgBmMSex0D/ToT4TYWnHB6BSm29lNGbX/KhlQ== In-Reply-To: Date: Tue, 25 Jan 2022 13:37:48 -0500 Message-Id: <9534c7fc5a885153a82b7f8240b981bf0707eb9e.1649248640.git.mail@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 | 41 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 82e9970cfb..849ca50852 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -864,11 +864,10 @@ (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) + (url "https://github.com/clojure/tools.deps.alpha") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -877,34 +876,13 @@ (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") - ""))))))) + ;; Could not initialize class + ;; org.eclipse.aether.transport.http.SslSocketFactory + ;; See maven-resolver-transport-http + #:tests? #f)) (propagated-inputs (list maven-resolver-api maven-resolver-spi maven-resolver-impl @@ -916,7 +894,12 @@ (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)) + (home-page "https://github.com/clojure/tools.deps.alpha") (synopsis "Clojure library supporting clojure-tools") (description "This package provides a functional API for transitive dependency graph expansion and the creation of classpaths.")