diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-14 18:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 18:01:45 +0000 |
| commit | 6630d8e9bb67fdc6023a4731d4c8f441e7903134 (patch) | |
| tree | 980a47c9e2478e622d6df7e18a34da2c1e4b6d3c /pkgs/development/tools/misc | |
| parent | b82409869abb3c92d80f1a9b854ad51ba9a7bd7d (diff) | |
| parent | f0bb8c9a784c53c0a584453a2377ff7864e94efe (diff) | |
| download | nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar.gz nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar.bz2 nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar.lz nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar.xz nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.tar.zst nixpkgs-6630d8e9bb67fdc6023a4731d4c8f441e7903134.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/clojure-lsp/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch | 12 |
2 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 8783d217c1f..b99e8a73457 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -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 diff --git a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch b/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch deleted file mode 100644 index 402189627c2..00000000000 --- a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch +++ /dev/null @@ -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" |