JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #90720 from jlesquembre/clj-547

Browse Source 
clojure: 1.10.1.507 -> 1.10.1.547
This commit is contained in:
Daniël de Kok 2020-06-19 20:16:59 +02:00 committed by GitHub
commit ad6c43fb33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/interpreters/clojure/TDEPS-150.patch
View File

@ -1,23 +0,0 @@
--- 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

6
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,15 +2,13 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.507";
version = "1.10.1.547";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "1k0jwa3481g3mkalwlb9gkcz9aq9zjpwmzckv823fr2d8djp41cc";
sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0";
};
patches = [ ./TDEPS-150.patch ];
buildInputs = [ makeWrapper ];
installPhase =