From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
To: 74973@debbugs.gnu.org, amorenompls@gmail.com
Cc: Rostislav Svoboda <Rostislav.Svoboda@gmail.com>
Subject: [bug#74973] [PATCH] gnu: Fix clojure-tools.
Date: Thu, 19 Dec 2024 15:22:27 +0100 [thread overview]
Message-ID: <71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@gmail.com> (raw)
* gnu/packages/clojure.scm (clojure-tools): The AOT compiled JAR must be
included and used by the bin/clojure script.
See also
https://yhetil.org/guix-user/CAOXoXz0fKD+3B+b_y6A8MPYxZcSRDusby6VWTUy8Nnp4Y0fAzQ@mail.gmail.com/
Change-Id: I3a8221fd415631f191cbf6ddcb0e8ecbd94e389f
---
gnu/packages/clojure.scm | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 09674f541e..6146b38753 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -204,18 +204,14 @@ (define-public clojure
(define-public clojure-tools
(package
(name "clojure-tools")
- (version "1.11.1.1413")
+ (version "1.12.0.1488")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.clojure.org/install/clojure-tools-"
version
".tar.gz"))
- (sha256 (base32 "1q0z71ifdxwvyy9gvq8mx8jbygf8cszrlhb3h22walfamnisbhwk"))
- ;; Remove AOT compiled JAR. The other JAR only contains uncompiled
- ;; Clojure source code.
- (snippet
- `(delete-file ,(string-append "clojure-tools-" version ".jar")))))
+ (sha256 (base32 "0hh78b22shj530armm9850cqr85wqdxyqfzx4qf45w5y200bw6dw"))))
(build-system copy-build-system)
(arguments
`(#:install-plan
@@ -223,6 +219,7 @@ (define-public clojure-tools
("example-deps.edn" "lib/clojure/")
("tools.edn" "lib/clojure/")
("exec.jar" "lib/clojure/libexec/")
+ (,(string-append "clojure-tools-" version ".jar") "lib/clojure/libexec/")
("clojure" "bin/")
("clj" "bin/"))
#:modules ((guix build copy-build-system)
@@ -237,17 +234,7 @@ (define-public clojure-tools
(("PREFIX") (string-append (assoc-ref outputs "out") "/lib/clojure")))
(substitute* "clj"
(("BINDIR") (string-append (assoc-ref outputs "out") "/bin"))
- (("rlwrap") (which "rlwrap")))))
- (add-after 'fix-paths 'copy-tools-deps-alpha-jar
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "clojure"
- (("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
- (string-join
- (append-map (match-lambda
- ((label . dir)
- (find-files dir "\\.jar$")))
- inputs)
- ":"))))))))
+ (("rlwrap") (which "rlwrap"))))))))
(inputs (list rlwrap
clojure
clojure-tools-deps
base-commit: 5634bc206d82a867850c86044c423b0a8700f34e
--
2.46.0
reply other threads:[~2024-12-19 14:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=71b44c3763ea0a72d756b300fbe36220a6899a5d.1734617873.git.Rostislav.Svoboda@gmail.com \
--to=rostislav.svoboda@gmail.com \
--cc=74973@debbugs.gnu.org \
--cc=amorenompls@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).