diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2020-06-19 20:16:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-19 20:16:59 +0200 |
commit | ad6c43fb333161779a5c3a2bf88e0adb727785a5 (patch) | |
tree | d777175731b32bc111d8d4d39ccfcd83c6814d31 /pkgs/development/interpreters/clojure | |
parent | 221fdca03ed0df1d8a37adcb007a9a1b8b44dfc8 (diff) | |
parent | 64b2789c4e3b27cb66c25d0e05d5516c8fbd17c0 (diff) |
Merge pull request #90720 from jlesquembre/clj-547
clojure: 1.10.1.507 -> 1.10.1.547
Diffstat (limited to 'pkgs/development/interpreters/clojure')
-rw-r--r-- | pkgs/development/interpreters/clojure/TDEPS-150.patch | 23 | ||||
-rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 6 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/development/interpreters/clojure/TDEPS-150.patch b/pkgs/development/interpreters/clojure/TDEPS-150.patch deleted file mode 100644 index 611134e8e3fa..000000000000 --- a/pkgs/development/interpreters/clojure/TDEPS-150.patch +++ /dev/null @@ -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 diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index e8c3e7b098ab..91166d9bfd46 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -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 = |