[bug#53765,16/17] gnu: clojure-tools-deps-alpha: Fix issues with S3
Commit Message
* 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(-)
@@ -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.")