From faaba6117872cdfbe8f6cdd25a26dd7e422f9614 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:03:32 +0200 Subject: [PATCH 01/11] maven: 3.9.6 -> 3.9.8 --- pkgs/by-name/ma/maven/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index 7856cadcfa94..2ed243dfc9f0 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.6"; + version = "3.9.8"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks="; + hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI="; }; sourceRoot = "."; From abd3fc8e75212b82d08199396e57de82659f12d3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:06:03 +0200 Subject: [PATCH 02/11] commafeed: update mvnHash --- pkgs/by-name/co/commafeed/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 369a5801ff48..61cad3e9682e 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -49,7 +49,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-YnEDJf4GeyiXxOh8tZZTZdLOJrisG6lmShXU97ueGNE="; + mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI="; mvnParameters = lib.escapeShellArgs [ "-Dskip.installnodenpm" From ae9d11bdb9a16380dffd618f20e1ad70a1656782 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:08:07 +0200 Subject: [PATCH 03/11] global-platform-pro: update mvnHash --- pkgs/development/tools/global-platform-pro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index dc533daf99a3..94186dc643c6 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec { sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; - mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU="; + mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; nativeBuildInputs = [ jdk8 makeWrapper ]; From 792c0c31d1a710705ac841ca513d8312e5ee551f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:09:14 +0200 Subject: [PATCH 04/11] gol: update mvnHash --- pkgs/by-name/go/gol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index 050fee242f6c..7096d7b854b4 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo="; }; - mvnHash = "sha256-b0nkp23gv4kejac/xrvm3xWo3Z8if7zveNUHBg7ZBm4="; + mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; @@ -20,7 +20,7 @@ maven.buildMavenPackage rec { runHook preInstall mkdir -p $out/{bin,lib} - cp /build/source/target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar + cp target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar makeWrapper ${jre}/bin/java $out/bin/gol \ --add-flags "-cp $out/lib/gol-tool.jar" \ From 4b8f29a38145cb0fac62d545a9a4857284dbbb45 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:10:17 +0200 Subject: [PATCH 05/11] h2: update mvnHash --- pkgs/servers/h2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index a143dd990e08..a083075711b8 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -14,7 +14,7 @@ maven.buildMavenPackage rec { }; mvnParameters = "-f h2/pom.xml"; - mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; + mvnHash = "sha256-kWRwaHb9+O07/jq8tgQnYpJa6zFsAMBCEnhT7HNKM4s="; nativeBuildInputs = [ makeWrapper ]; From f8d55e9b6ba7f668e1baa64092ba245f3fad85a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:11:35 +0200 Subject: [PATCH 06/11] jd-cli: update mvnHash --- pkgs/tools/security/jd-cli/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix index 10fa31a706c1..d99c1e687ac3 100644 --- a/pkgs/tools/security/jd-cli/default.nix +++ b/pkgs/tools/security/jd-cli/default.nix @@ -11,7 +11,9 @@ maven.buildMavenPackage rec { hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; - mvnHash = "sha256-yqMAEjaNHxm/c/cbApiMjkN7V6Gx/crs1LPbD0k0cgk="; + mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo="; + + mvnParameters = "-DskipTests"; nativeBuildInputs = [ makeWrapper ]; From 983da955d85de040053744f934bd05de5265a159 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:13:10 +0200 Subject: [PATCH 07/11] kotlin-interactive-shell: update mvnHash --- pkgs/by-name/ko/kotlin-interactive-shell/package.nix | 2 +- 1 file changed, 1 insertion(+), 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 752be68d4245..83b0a99890fa 100644 --- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix +++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -11,7 +11,7 @@ maven.buildMavenPackage rec { hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE="; }; - mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI="; + mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM="; mvnParameters = "compile"; nativeBuildInputs = [ makeWrapper ]; From 3fdbfbc36aafdeee748c83d29069c87442857cfa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:14:47 +0200 Subject: [PATCH 08/11] slipstream: update mvnHash --- pkgs/tools/games/slipstream/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 7be7983a2501..522f9ec5d25b 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -13,7 +13,7 @@ mavenWithJdk.buildMavenPackage rec { hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU="; }; - mvnHash = "sha256-zqXbLnLmTZHzwH+vgGASR7Jsz1t173DmQMIe2R6B6Ic="; + mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c="; nativeBuildInputs = [ makeWrapper ]; From 78bd226e97aab022430481cd65a007f6a581018a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:15:07 +0200 Subject: [PATCH 09/11] tabula-java: update mvnHash --- pkgs/applications/misc/tabula-java/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 4c437ea6df5d..011f92362a31 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -16,7 +16,7 @@ maven.buildMavenPackage rec { hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw="; }; - mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw="; + mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; From ccffb46f87aea73dc75071dbaa1b6f607f631893 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:16:48 +0200 Subject: [PATCH 10/11] openrefine: update mvnHash --- pkgs/applications/science/misc/openrefine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b94f23671024..4f928e727da1 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -56,7 +56,7 @@ in maven'.buildMavenPackage { cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; + mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ="; nativeBuildInputs = [ makeWrapper ]; From e7899adcd0ef2401af900881274248b6bc8c27cd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:16:55 +0200 Subject: [PATCH 11/11] runelite: update mvnHash --- pkgs/games/runelite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 031cd81f13d5..22db910b30d2 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -25,7 +25,7 @@ mavenJdk17.buildMavenPackage rec { rev = version; hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw="; }; - mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk="; + mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM="; desktop = makeDesktopItem { name = "RuneLite";