3
0
Fork 0
forked from mirrors/nixpkgs

clojure 1.10.1.492 -> 1.10.1.507 plus bugfix (#79868)

This commit is contained in:
Hlöðver Sigurðsson 2020-02-12 12:50:50 +01:00 committed by GitHub
parent 9fb6c2b6d5
commit 91801c0b45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 15 deletions

View file

@ -0,0 +1,23 @@
--- a/clojure
+++ b/clojure
@@ -317,17 +317,17 @@ if "$stale" || "$pom"; then
tools_args+=("--threads" "$threads")
fi
if "$trace"; then
tools_args+=("--trace")
fi
fi
# If stale, run make-classpath to refresh cached classpath
-if [[ "$stale" = true && "$describe" = false ]]; then
+if [[ "$stale" = true && "$describe" = false && -z "$force_cp" ]]; then
if "$verbose"; then
echo "Refreshing classpath"
fi
"$JAVA_CMD" -classpath "$tools_cp" clojure.main -m clojure.tools.deps.alpha.script.make-classpath2 --config-user "$config_user" --config-project "$config_project" --libs-file "$libs_file" --cp-file "$cp_file" --jvm-file "$jvm_file" --main-file "$main_file" "${tools_args[@]}"
fi
if "$describe"; then
--
2.25.0

View file

@ -2,16 +2,19 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.492";
version = "1.10.1.507";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
sha256 = "1k0jwa3481g3mkalwlb9gkcz9aq9zjpwmzckv823fr2d8djp41cc";
};
patches = [ ./TDEPS-150.patch ];
buildInputs = [ makeWrapper ];
installPhase = let
installPhase =
let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in
''
@ -27,6 +30,13 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
'';
doInstallCheck = true;
installCheckPhase = ''
CLJ_CONFIG=$out CLJ_CACHE=$out/libexec $out/bin/clojure \
-Spath \
-Sverbose \
-Scp $out/libexec/clojure-tools-${version}.jar
'';
meta = with stdenv.lib; {
description = "A Lisp dialect for the JVM";
homepage = https://clojure.org/;