Unverified Commit e7bd1a60 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #323272 from r-ryantm/auto-update/jdt-language-server 

jdt-language-server: 1.36.0 -> 1.37.0
parents f0f0aaed 8096817a

pkgs/by-name/jd/jdt-language-server/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 
}:



let

  timestamp = "202405301306";

  timestamp = "202406271335";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "jdt-language-server";

  version = "1.36.0";

  version = "1.37.0";



  src = fetchurl {

    url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";

    hash = "sha256-Ao4nTQb0phytT/1W+J70FKj2VhPG0F2UZ2Ubf7A9rns=";

    hash = "sha256-0EzZ9N9FzoWunPSVMMcqGjJLFO7nR68m4zdFAONrW9A=";

  };



  sourceRoot = ".";
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { 
    # than in the original package. In addition, hard-code the path to the jdk

    # in the wrapper, instead of searching for it in PATH at runtime.

    substituteInPlace bin/jdtls.py \

      --replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \

      --replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'"

      --replace-fail "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \

      --replace-fail "java_executable = get_java_executable(known_args)" "java_executable = '${lib.getExe jdk}'"

  '';



  installPhase =