Skip to content

maven: 3.8.6 -> 3.9.2 #238746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wegank merged 2 commits into from
Jun 20, 2023
Merged

maven: 3.8.6 -> 3.9.2 #238746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdbfdee
maven: 3.8.6 -> 3.9.2
Tillerino Jun 20, 2023
13dd515
maven: adjust hashes of pull-maven-dependencies derivations
Tillerino Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/misc/dbeaver/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ in
hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
};

mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
mvnHash = "sha256-ERZYDsPxp1YXteSmunFIgTGZUYqjZJhqrNytLnIUNBQ=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note to self) This package is up-to-date and I opened a PR to enforce all maven plugin versions to be set. With the next update of this package, the hash should no longer be affected by the Maven version.

Copy link
Copy Markdown
Member

@wegank wegank Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Would you like to propose a PR to supersede #232348?

Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

argh, I got the wrong file. I wanted to make this note on the forge-mtg file. I'm going though r/n and will be making notes as I go.

Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I got to this repo now and opened the enforce PR: dbeaver/dbeaver#20341

I don't think it's worth waiting for a merge and release, so please disregard w.r.t. #232348

mvnParameters = "-P desktop,all-platforms";

nativeBuildInputs = [
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/digital/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ javaPackages.mavenfod rec {
};

inherit mvnParameters;
mvnHash = "sha256-tc4mrXeyeI973IsNA9CcYJXEtTj91DcpCSmVYBYytt8=";
mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was also up-to-date and I opened a PR: hneemann/Digital#1170


nativeBuildInputs = [ copyDesktopItems maven makeWrapper ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/apache-maven/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/tools/global-platform-pro/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1qwgvz6l5wia8q5824c9f3iwyapfskljhqf1z09fw6jjj1jy3b15";
outputHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was not up-to-date at all. Opened a PR about the plugin versions anyway: martinpaljak/GlobalPlatformPro#321

};

nativeBuildInputs = [ jdk maven makeWrapper ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/tools/java/java-language-server/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ javaPackages.mavenfod rec {

mvnFetchExtraArgs.dontConfigure = true;
mvnParameters = "-DskipTests";
mvnHash = "sha256-2MVlF3QIWiDvUlnMH4RLi2Od57aoh8zK/OmHqztOnZ4=";
mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note to self) this project seems kind of dead. there are really trivial PRs that haven't been merged in months :(

I threw in the enforce PR just to kind of see what will happen: georgewfraser/java-language-server#259

Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind, this was merged :)


nativeBuildInputs = [ maven jdk makeWrapper ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/games/forge-mtg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ in javaPackages.mavenfod {

# Tests need a running Xorg.
mvnParameters = "-DskipTests";
mvnHash = "sha256-Bq02zyOZjah5jtFBEvE+Xif6aAAwPiuP5sUL42V8dUs=";
mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note to self) This package is up-to-date and I opened a PR to enforce all maven plugin versions to be set. With the next update of this package, the hash should no longer be affected by the Maven version.


nativeBuildInputs = [ maven makeWrapper ];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/exhibitor/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45";
rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd";
};
mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv";
mavenDependenciesSha256 = "sha256-oGd8PFF1Z9BElNsgqbC/llQm8j/T+T01VwvSw3tTU0E=";
Comment thread
wegank marked this conversation as resolved.
# This is adapted from https://github.com/volth/nixpkgs/blob/6aa470dfd57cae46758b62010a93c5ff115215d7/pkgs/applications/networking/cluster/hadoop/default.nix#L20-L32
fetchedMavenDeps = stdenv.mkDerivation {
name = "exhibitor-${version}-maven-deps";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/security/jd-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ javaPackages.mavenfod rec {
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
};

mvnHash = "sha256-EIam0rxmCBs/mpMck6ePFoQBQ6KYYNqJKVE32gdXPfE=";
mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo=";
Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note to self) This package was up to date. Opened an enforce PR: intoolswetrust/jd-cli#94

Copy link
Copy Markdown
Contributor Author

@Tillerino Tillerino Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was merged


nativeBuildInputs = [ maven makeWrapper ];

Expand Down