This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 5bde01c062 Revert "gnu: clojure-tools: Add coreutils-minimal and
openjdk inputs."
5bde01c062 is described below
commit 5bde01c0621bbab37ab5aa5b018871cdff02cd9f
Author: Mathieu Lirzin <[email protected]>
AuthorDate: Wed Feb 11 08:25:14 2026 +0100
Revert "gnu: clojure-tools: Add coreutils-minimal and openjdk inputs."
This reverts commit 1481959db7372d7cc919fe77155030b3b3f67339.
Change-Id: I9c05bb3575da3a45ee358ed5eacbd6e6e0a6885f
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/clojure.scm | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 450eb29bdd..be6c1ad95f 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -24,8 +24,6 @@
(define-module (gnu packages clojure)
#:use-module (gnu packages)
- #:use-module (gnu packages base)
- #:use-module (gnu packages guile)
#:use-module (gnu packages java)
#:use-module (gnu packages maven)
#:use-module (guix gexp)
@@ -35,7 +33,8 @@
#:use-module (guix git-download)
#:use-module (guix build-system ant)
#:use-module (guix build-system copy)
- #:use-module (guix build-system clojure))
+ #:use-module (guix build-system clojure)
+ #:use-module (ice-9 match))
(define-public clojure-spec-alpha
(package
@@ -406,30 +405,21 @@ designs.")
(substitute* "clj"
(("BINDIR") (string-append #$output "/bin")))
(substitute* "clojure"
- (("PREFIX") (string-append #$output "/lib/clojure")))
- (let ((coreutils #$(this-package-input "coreutils-minimal"))
- (jre #$(this-package-input "openjdk")))
- (wrap-script "clojure"
- `("JAVA_HOME" = (,jre))
- `("PATH" = (,(string-append coreutils "/bin")))))))
+ (("PREFIX") (string-append #$output "/lib/clojure")))))
(add-after 'fix-paths 'copy-tools-deps-alpha-jar
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "clojure"
(("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
- (let* ((selected (assq-remove! inputs "openjdk"))
- (input-dirs (map cdr selected))
+ (let* ((input-dirs (map cdr inputs))
(jars (apply append
(map (lambda (dir)
(find-files dir "\\.jar$"))
input-dirs))))
(string-join jars ":")))))))))
- (inputs (list coreutils-minimal
- clojure
+ (inputs (list clojure
clojure-tools-deps
- guile-3.0/pinned
java-commons-logging-minimal
- java-slf4j-nop
- openjdk))
+ java-slf4j-nop))
(home-page "https://clojure.org/releases/tools")
(synopsis "CLI tools for the Clojure programming language")
(description "This package provides the @command{clojure} and