Skip to content

Commit 341c3b7

Browse files
committed
lemminx: refactor to online build
1 parent 06af86f commit 341c3b7

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

pkgs/by-name/le/lemminx/package.nix

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,11 @@ maven.buildMavenPackage rec {
4242
'';
4343
};
4444

45-
manualMvnArtifacts = [
46-
"org.apache.maven.surefire:surefire-junit-platform:3.1.2"
47-
"org.junit.platform:junit-platform-launcher:1.10.0"
48-
];
49-
5045
mvnJdk = jdk_headless;
51-
mvnHash = "sha256-jIvYUATcNUZZmZcXbUMqyHGX4CYiXqL0jkji+zrCYJY=";
52-
53-
buildOffline = true;
54-
55-
# disable gitcommitid plugin which needs a .git folder which we
56-
# don't have
57-
mvnDepsParameters = "-Dmaven.gitcommitid.skip=true";
46+
mvnHash = "sha256-Bl+fASYrSIzpmI0FQ3N7CUJb3a04wq3Vzc27JbD8qk8=";
5847

59-
# disable failing tests which either need internet access or are flaky
48+
# Disable gitcommitid plugin which needs a .git folder which we don't have.
49+
# Disable failing tests which either need internet access or are flaky.
6050
mvnParameters = lib.escapeShellArgs [
6151
"-Dmaven.gitcommitid.skip=true"
6252
"-Dtest=!XMLValidationCommandTest,
@@ -70,15 +60,16 @@ maven.buildMavenPackage rec {
7060
!MissingChildElementCodeActionTest,
7161
!XSDValidationExternalResourcesTest,
7262
!DocumentLifecycleParticipantTest,
73-
!DTDValidationExternalResourcesTest"
63+
!DTDValidationExternalResourcesTest,
64+
!DTDHoverExtensionsTest,
65+
!CacheResourcesManagerTest"
7466
];
7567

7668
installPhase = ''
7769
runHook preInstall
7870
7971
mkdir -p $out/bin $out/share
80-
install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar \
81-
$out/share
72+
install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar $out/share
8273
8374
makeWrapper ${jre}/bin/java $out/bin/lemminx \
8475
--add-flags "-jar $out/share/org.eclipse.lemminx-uber.jar"

0 commit comments

Comments
 (0)