summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-25 00:01:35 +0000
committerGitHub <noreply@github.com>2021-07-25 00:01:35 +0000
commita37fbac53b1041937926ac62d49b09cf7a7088cc (patch)
treed9d4a537fca2eae08a7c0918e348d8828866c2bb /pkgs/misc
parent859acbc1bc439bdb3d7a55001f754b1b9b30a7f6 (diff)
parentecaf3da9340231e5493eccc3db87604a3705da42 (diff)
downloadnixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar.gz
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar.bz2
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar.lz
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar.xz
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.tar.zst
nixpkgs-a37fbac53b1041937926ac62d49b09cf7a7088cc.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/vscode-extensions/default.nix21
1 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8c8ab911cc3..32335990534 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }:
+{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq
+, shellcheck, moreutils, racket-minimal, clojure-lsp
+}:
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -206,6 +208,23 @@ let
         };
       };
 
+      betterthantomorrow.calva = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "calva";
+          publisher = "betterthantomorrow";
+          version = "2.0.205";
+          sha256 = "sha256-umnG1uLB42fUNKjANaKcABjVmqbdOQakd/6TPsEpF9c";
+        };
+        nativeBuildInputs = [ jq moreutils ];
+        postInstall = ''
+          cd "$out/$installPrefix"
+          jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json
+        '';
+        meta = with lib; {
+          license = licenses.mit;
+        };
+      };
+
       bodil.file-browser = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "file-browser";