From a2ab68ab9263224bb01b92a62852ef741dd6880f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:29:33 -0300 Subject: [PATCH 01/11] buildMavenPackage: add doCheck support --- .../tools/build-managers/apache-maven/build-package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix index df5d67cb42e6..f9ff54696dfe 100644 --- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -6,6 +6,7 @@ { src , sourceRoot ? null , buildOffline ? false +, doCheck ? true , patches ? [ ] , pname , version @@ -22,6 +23,7 @@ # created to allow using maven packages in the same style as rust let + mvnSkipTests = lib.optionalString (!doCheck) "-DskipTests"; fetchedMavenDeps = stdenv.mkDerivation ({ name = "${pname}-${version}-maven-deps"; inherit src sourceRoot patches; @@ -49,7 +51,7 @@ let mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2 done '' + lib.optionalString (!buildOffline) '' - mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + mvn package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters} '' + '' runHook postBuild ''; @@ -85,7 +87,7 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { runHook preBuild mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) - mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnParameters} + mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild ''; From af11e0182ce58de8fa01b1f8aa5fed08fa7c196d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:30:51 -0300 Subject: [PATCH 02/11] mariadb-connector-java: normalize doCheck --- pkgs/by-name/ma/mariadb-connector-java/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix index d6fed528e1d0..3fa6f7a5186c 100644 --- a/pkgs/by-name/ma/mariadb-connector-java/package.nix +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -17,8 +17,7 @@ maven.buildMavenPackage rec { mvnHash = "sha256-7O+G5HT6mtp12zWL3Gn12KPVUwp3GMaWGvXX6Sg1+6k="; - # Disable tests because they require networking - mvnParameters = "-DskipTests"; + doCheck = false; # Requires networking installPhase = '' runHook preInstall From 1ca1182e537bd52ce9c1870de42e186f8d64f7e1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:37:37 -0300 Subject: [PATCH 03/11] forge-mtg: normalize doCheck --- pkgs/games/forge-mtg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix index cc5c56977bb9..8ca1675591ee 100644 --- a/pkgs/games/forge-mtg/default.nix +++ b/pkgs/games/forge-mtg/default.nix @@ -25,10 +25,10 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - # Tests need a running Xorg. - mvnParameters = "-DskipTests"; mvnHash = "sha256-QK9g0tG75lIhEtf4jW03N32YbD9Fe5iI0JTuqmCTtnE="; + doCheck = false; # Needs a running Xorg + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 2c5961d4b7cd70a738e6d2e6f54309beabf96ef8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:39:18 -0300 Subject: [PATCH 04/11] java-language-server: normalize doCheck --- pkgs/development/tools/java/java-language-server/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 0cca4d4ca56e..744e20fce611 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -23,7 +23,6 @@ maven.buildMavenPackage rec { }; mvnFetchExtraArgs.dontConfigure = true; - mvnParameters = "-DskipTests"; mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; nativeBuildInputs = [ jdk makeWrapper ]; @@ -39,6 +38,8 @@ maven.buildMavenPackage rec { --compress 2 ''; + doCheck = false; + installPhase = '' runHook preInstall From 66472eba4d12ba882b7c53f262d7ac7bd3c78c92 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:40:55 -0300 Subject: [PATCH 05/11] commafeed: normalize doCheck --- pkgs/by-name/co/commafeed/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index cc203468feea..369a5801ff48 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -56,7 +56,6 @@ maven.buildMavenPackage { "-Dskip.npm" "-Dspotless.check.skip" "-Dmaven.gitcommitid.skip" - "-DskipTests" ]; nativeBuildInputs = [ makeWrapper ]; @@ -71,6 +70,8 @@ maven.buildMavenPackage { runHook postConfigure ''; + doCheck = false; + installPhase = '' runHook preInstall From 2037c8febc673d2f21b923d0241732c5dbe8b48f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:42:21 -0300 Subject: [PATCH 06/11] openrefine: normalize doCheck --- pkgs/applications/science/misc/openrefine/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 6a9d4be6c50b..b94f23671024 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -55,11 +55,13 @@ in maven'.buildMavenPackage { postPatch = '' cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; - mvnParameters = "-DskipTests=true -pl !packaging"; + mvnParameters = "-pl !packaging"; mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' mkdir -p $out/lib/server/target/lib cp -r server/target/lib/* $out/lib/server/target/lib/ From 5c263158043914f50da9d489f371a6ddd6a45656 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:43:23 -0300 Subject: [PATCH 07/11] ns-usbloader: normalize doCheck --- pkgs/applications/misc/ns-usbloader/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 8ab52711a6ce..a97d3e6f9f88 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -37,7 +37,6 @@ maven.buildMavenPackage rec { x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA="; aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw="; }; - mvnParameters = "-DskipTests"; nativeBuildInputs = [ copyDesktopItems @@ -46,6 +45,8 @@ maven.buildMavenPackage rec { gvfs ]; + doCheck = false; + # Don't wrap binaries twice. dontWrapGApps = true; From 9855e223acb301475f463743b3543ef4ba66e846 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:45:34 -0300 Subject: [PATCH 08/11] sonarlint-ls: normalize doCheck --- pkgs/by-name/so/sonarlint-ls/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 8382d3b8b270..42b8d6098947 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -40,7 +40,7 @@ mavenJdk17.buildMavenPackage rec { # disable node and npm module installation because the need network access # for the tests. - mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm -DskipTests package"; + mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm package"; # disable failing tests which either need network access or are flaky mvnParameters = lib.escapeShellArgs [ @@ -53,6 +53,8 @@ mavenJdk17.buildMavenPackage rec { !JavaMediumTests" ]; + doCheck = false; + installPhase = '' runHook preInstall From aa993504e77e78b7e52f0c67f11b884ef0c78d42 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:46:33 -0300 Subject: [PATCH 09/11] kotlin-interactive-shell: normalize doCheck --- pkgs/by-name/ko/kotlin-interactive-shell/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix index 23848a48969e..752be68d4245 100644 --- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix +++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -12,10 +12,12 @@ maven.buildMavenPackage rec { }; mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI="; - mvnParameters = "-DskipTests compile"; + mvnParameters = "compile"; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' runHook preInstall From 44e435d24151be6878eee6eb88629843810b40eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:47:10 -0300 Subject: [PATCH 10/11] h2: normalize doCheck --- pkgs/servers/h2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index 84a8b98b6dfc..297802f59a92 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -13,11 +13,13 @@ maven.buildMavenPackage rec { hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g="; }; - mvnParameters = "-f h2/pom.xml -DskipTests"; + mvnParameters = "-f h2/pom.xml"; mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' mkdir -p $out/share/java install -Dm644 h2/target/h2-${version}.jar $out/share/java From 6ab6515def09d321385be3b657071ae8142b4e9d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:48:25 -0300 Subject: [PATCH 11/11] s3proxy: normalize doCheck --- pkgs/by-name/s3/s3proxy/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix index b2fd1b03a5ab..72f18af79cc1 100644 --- a/pkgs/by-name/s3/s3proxy/package.nix +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -21,7 +21,7 @@ maven.buildMavenPackage { hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; }; - mvnParameters = lib.optionalString stdenv.isDarwin "-DskipTests"; + doCheck = !stdenv.isDarwin; nativeBuildInputs = [ makeWrapper ];