diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/by-name/cl/clojure-lsp/package.nix similarity index 81% rename from pkgs/development/tools/misc/clojure-lsp/default.nix rename to pkgs/by-name/cl/clojure-lsp/package.nix index b76cbf71df4c..23c23f8065c5 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, buildGraalvmNativeImage -, babashka -, fetchurl -, fetchFromGitHub -, clojure -, writeScript -, testers -, clojure-lsp +{ + lib, + stdenv, + buildGraalvmNativeImage, + babashka, + fetchurl, + fetchFromGitHub, + clojure, + writeScript, + testers, + clojure-lsp, }: buildGraalvmNativeImage rec { @@ -35,17 +36,18 @@ buildGraalvmNativeImage rec { ]; doCheck = true; - checkPhase = '' - runHook preCheck + checkPhase = + '' + runHook preCheck - export HOME="$(mktemp -d)" - ./clojure-lsp --version | fgrep -q '${version}' - '' - # TODO: fix classpath issue per https://github.com/NixOS/nixpkgs/pull/153770 - #${babashka}/bin/bb integration-test ./clojure-lsp - + '' - runHook postCheck - ''; + export HOME="$(mktemp -d)" + ./clojure-lsp --version | fgrep -q '${version}' + '' + # TODO: fix classpath issue per https://github.com/NixOS/nixpkgs/pull/153770 + #${babashka}/bin/bb integration-test ./clojure-lsp + + '' + runHook postCheck + ''; passthru.tests.version = testers.testVersion { inherit version; @@ -78,7 +80,7 @@ buildGraalvmNativeImage rec { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/clojure-lsp/clojure-lsp"; changelog = "https://github.com/clojure-lsp/clojure-lsp/releases/tag/${version}"; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.mit; maintainers = [ lib.maintainers.ericdallo ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66cdefee0b5b..b873c3effe29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17140,8 +17140,6 @@ with pkgs; jdk = jdk21; }; - clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; - clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall;