diff options
| author | José Luis Lafuente <jl@lafuente.me> | 2020-06-18 11:32:39 +0200 |
|---|---|---|
| committer | José Luis Lafuente <jl@lafuente.me> | 2020-06-18 11:32:39 +0200 |
| commit | 64b2789c4e3b27cb66c25d0e05d5516c8fbd17c0 (patch) | |
| tree | 2533cf7dd39e48f0912444f98071e2e15eb5106c /pkgs/development/interpreters/clojure | |
| parent | b47873026c7e356a340d0e1de7789d4e8428ac66 (diff) | |
clojure: 1.10.1.507 -> 1.10.1.547
Patch no longer need, added upstream:
https://clojure.atlassian.net/browse/TDEPS-150
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 = |