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

Merge pull request #238746 from Tillerino/update/maven

maven: 3.8.6 -> 3.9.2
parents d22a44e5 13dd515a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ in
    hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
  };

  mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
  mvnHash = "sha256-ERZYDsPxp1YXteSmunFIgTGZUYqjZJhqrNytLnIUNBQ=";
  mvnParameters = "-P desktop,all-platforms";

  nativeBuildInputs = [
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ javaPackages.mavenfod rec {
  };

  inherit mvnParameters;
  mvnHash = "sha256-tc4mrXeyeI973IsNA9CcYJXEtTj91DcpCSmVYBYytt8=";
  mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";

  nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ assert jdk != null;

stdenv.mkDerivation rec {
  pname = "apache-maven";
  version = "3.8.6";
  version = "3.9.2";

  builder = ./builder.sh;

  src = fetchurl {
    url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
    sha256 = "sha256-xwR6SN62Jqvyb3GrNkPSltubHmfx+qfZiGN96sh2tak=";
    sha256 = "sha256-gJ7zIgxtF5GVwGwyTLmm002Oy6Vmxc/Y64MWe8A0EX0=";
  };

  nativeBuildInputs = [ makeWrapper ];
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    '';
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
    outputHash = "1qwgvz6l5wia8q5824c9f3iwyapfskljhqf1z09fw6jjj1jy3b15";
    outputHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k=";
  };

  nativeBuildInputs = [ jdk maven makeWrapper ];
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ javaPackages.mavenfod rec {

  mvnFetchExtraArgs.dontConfigure = true;
  mvnParameters = "-DskipTests";
  mvnHash = "sha256-2MVlF3QIWiDvUlnMH4RLi2Od57aoh8zK/OmHqztOnZ4=";
  mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc=";

  nativeBuildInputs = [ maven jdk makeWrapper ];

Loading