From 61f9022a1dd8c9f7437b2152f7007b9ac2afbec1 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 3 May 2024 14:52:34 +0200
Subject: [PATCH 1/2] clojure-lsp: 2023.08.06-00.28.06 -> 2024.04.22-11.50.26

Release notes: https://github.com/clojure-lsp/clojure-lsp/releases/tag/2024.04.22-11.50.26

Also applied the requested cleanups:

* change sha256 -> hash
* removed withs
* documented where the build args come from
* removed pname usage
* added meta.changelog
---
 .../tools/misc/clojure-lsp/default.nix        | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 73f8e6dcd431..b76cbf71df4c 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -12,23 +12,26 @@
 
 buildGraalvmNativeImage rec {
   pname = "clojure-lsp";
-  version = "2023.08.06-00.28.06";
+  version = "2024.04.22-11.50.26";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "clojure-lsp";
+    repo = "clojure-lsp";
     rev = version;
-    sha256 = "sha256-wc7M2cPRtdaRzZn3GNu/aCbQ2VqxiDxvu/b7qnBVUBo=";
+    hash = "sha256-GyPIFYR+/BZ+vq6+yuer5HoVILXLWNw1sW8XpJ7q4SA=";
   };
 
   jar = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
-    sha256 = "c301821ac6914999a44f5c1cd371d46b248fe9a2e31d43a666d0bc2656cfdd78";
+    hash = "sha256-dB16225A7L3nWplvqlal+5gho+LmqqVGPN9dfasKaPk=";
   };
 
   extraNativeImageBuildArgs = [
+    # These build args mirror the build.clj upstream
+    # ref: https://github.com/clojure-lsp/clojure-lsp/blob/2024.04.22-11.50.26/cli/build.clj#L141-L144
     "--no-fallback"
     "--native-image-info"
+    "--features=clj_easy.graal_build_time.InitClojureClasses"
   ];
 
   doCheck = true;
@@ -36,10 +39,10 @@ buildGraalvmNativeImage rec {
     runHook preCheck
 
     export HOME="$(mktemp -d)"
-    ./${pname} --version | fgrep -q '${version}'
+    ./clojure-lsp --version | fgrep -q '${version}'
   ''
   # TODO: fix classpath issue per https://github.com/NixOS/nixpkgs/pull/153770
-  #${babashka}/bin/bb integration-test ./${pname}
+  #${babashka}/bin/bb integration-test ./clojure-lsp
   + ''
     runHook postCheck
   '';
@@ -71,11 +74,12 @@ buildGraalvmNativeImage rec {
     update-source-version clojure-lsp "$latest_version"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Language Server Protocol (LSP) for Clojure";
     homepage = "https://github.com/clojure-lsp/clojure-lsp";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ ericdallo ];
+    changelog = "https://github.com/clojure-lsp/clojure-lsp/releases/tag/${version}";
+    sourceProvenance =  [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ericdallo ];
   };
 }

From 190c3792b9bdea0a43aeac5da469509fed5210af Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 21 Jun 2024 14:31:40 +0200
Subject: [PATCH 2/2] clojure-lsp: move to pkgs/by-name/cl/clojure-lsp and
 apply nixfmt

---
 .../cl/clojure-lsp/package.nix}               | 44 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 23 insertions(+), 23 deletions(-)
 rename pkgs/{development/tools/misc/clojure-lsp/default.nix => by-name/cl/clojure-lsp/package.nix} (81%)

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;