mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 10:23:29 +00:00
Merge pull request #130038 from ericdallo/bump-clojure-lsp
clojure-lsp: 2021.06.01-16.19.44 -> 2021.07.12-12.30.59
This commit is contained in:
commit
fe88f6415c
@ -1,28 +1,26 @@
|
||||
{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub }:
|
||||
{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "2021.06.01-16.19.44";
|
||||
version = "2021.07.12-12.30.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao=";
|
||||
sha256 = "0iky3yh548xn28285x8gnjzc00f3i2b415wb2dhd9p9y2bgzhkld";
|
||||
};
|
||||
|
||||
jar = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar";
|
||||
sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q=";
|
||||
sha256 = "02k1k0slh1lm7k43d52jvgl0fdyp9gcr8csbr6yi71qbhy0axrmp";
|
||||
};
|
||||
|
||||
GRAALVM_HOME = graalvm11-ce;
|
||||
CLOJURE_LSP_JAR = jar;
|
||||
CLOJURE_LSP_XMX = "-J-Xmx4g";
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./disable-check-toolchain.patch ];
|
||||
|
||||
buildInputs = [ graalvm11-ce ];
|
||||
buildInputs = [ graalvm11-ce clojure ];
|
||||
|
||||
buildPhase = with lib; ''
|
||||
runHook preBuild
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git a/graalvm/native-unix-compile.sh b/graalvm/native-unix-compile.sh
|
||||
index ec0e49f..e19a120 100755
|
||||
--- a/graalvm/native-unix-compile.sh
|
||||
+++ b/graalvm/native-unix-compile.sh
|
||||
@@ -17,6 +17,7 @@ CLOJURE_LSP_XMX=${CLOJURE_LSP_XMX:-"-J-Xmx4g"}
|
||||
|
||||
args=("-jar" "$CLOJURE_LSP_JAR"
|
||||
"-H:+ReportExceptionStackTraces"
|
||||
+ "-H:-CheckToolchain"
|
||||
"--verbose"
|
||||
"--no-fallback"
|
||||
"--native-image-info"
|
Loading…
Reference in New Issue
Block a user