From 13dd515a921667b798a30823b888e9a2135a480b Mon Sep 17 00:00:00 2001 From: Tillerino Date: Tue, 20 Jun 2023 13:15:27 +0200 Subject: maven: adjust hashes of pull-maven-dependencies derivations Since the newer Maven pulls different versions of its own dependencies, the hashes of these derivations all changed. --- pkgs/applications/misc/dbeaver/default.nix | 2 +- pkgs/applications/science/electronics/digital/default.nix | 2 +- pkgs/development/tools/global-platform-pro/default.nix | 2 +- pkgs/development/tools/java/java-language-server/default.nix | 2 +- pkgs/games/forge-mtg/default.nix | 2 +- pkgs/servers/exhibitor/default.nix | 2 +- pkgs/tools/security/jd-cli/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index a42fb298df0..b984047bb7a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -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 = [ diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 6eb0ef6d5bb..b0fa0af6c48 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -39,7 +39,7 @@ javaPackages.mavenfod rec { }; inherit mvnParameters; - mvnHash = "sha256-tc4mrXeyeI973IsNA9CcYJXEtTj91DcpCSmVYBYytt8="; + mvnHash = "sha256-Ej/JePvd9Ieni8FqSaXBDc2T6Cwr8WP54iko8wYiT68="; nativeBuildInputs = [ copyDesktopItems maven makeWrapper ]; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 3f4f998ff97..a8e9b957d27 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1qwgvz6l5wia8q5824c9f3iwyapfskljhqf1z09fw6jjj1jy3b15"; + outputHash = "sha256-rRLsCTY3fEAvGRDvNXqpjac2Gb5fdlyhK2wTK5CVN9k="; }; nativeBuildInputs = [ jdk maven makeWrapper ]; diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 8451fe15e75..0a11c9c0e79 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -24,7 +24,7 @@ javaPackages.mavenfod rec { mvnFetchExtraArgs.dontConfigure = true; mvnParameters = "-DskipTests"; - mvnHash = "sha256-2MVlF3QIWiDvUlnMH4RLi2Od57aoh8zK/OmHqztOnZ4="; + mvnHash = "sha256-bzYBSrCS9Kp+qnVO60h915Or1VWabphwLEu6lcBULuc="; nativeBuildInputs = [ maven jdk makeWrapper ]; diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix index bc59764e8aa..e5b209c6510 100644 --- a/pkgs/games/forge-mtg/default.nix +++ b/pkgs/games/forge-mtg/default.nix @@ -28,7 +28,7 @@ in javaPackages.mavenfod { # Tests need a running Xorg. mvnParameters = "-DskipTests"; - mvnHash = "sha256-Bq02zyOZjah5jtFBEvE+Xif6aAAwPiuP5sUL42V8dUs="; + mvnHash = "sha256-ajrHnaiJS7ZnR9BjLaXK2bnAKCp5UWQqYpjWbz3z6bw="; nativeBuildInputs = [ maven makeWrapper ]; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index fa5c4a948ce..4d6a09ed1b7 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45"; rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd"; }; - mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv"; + mavenDependenciesSha256 = "sha256-oGd8PFF1Z9BElNsgqbC/llQm8j/T+T01VwvSw3tTU0E="; # 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"; diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix index 84aa6018204..b345565cbba 100644 --- a/pkgs/tools/security/jd-cli/default.nix +++ b/pkgs/tools/security/jd-cli/default.nix @@ -11,7 +11,7 @@ javaPackages.mavenfod rec { hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; - mvnHash = "sha256-EIam0rxmCBs/mpMck6ePFoQBQ6KYYNqJKVE32gdXPfE="; + mvnHash = "sha256-kLpjMj05uC94/5vGMwMlFzLKNFOKeyNvq/vmB6pHTAo="; nativeBuildInputs = [ maven makeWrapper ]; -- cgit 1.4.1