spring-boot-cli: 2.1.9->2.2.5

pkgs/development/tools/spring-boot-cli/default.nix

@@ -1,12 +1,12 @@
-{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }:
+{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }:
 
 stdenv.mkDerivation rec {
-  pname = "spring-boot";
-  version = "2.1.9";
+  pname = "spring-boot-cli";
+  version = "2.2.6";
 
   src = fetchzip {
-    url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip";
-    sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j";
+    url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip";
+    sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     rm -r shell-completion
     cp -r . $out
     wrapProgram $out/bin/spring \
-      --prefix JAVA_HOME : ${jdk}
+      --set JAVA_HOME ${jdk} \
+      --set PATH /bin:${coreutils}/bin:${jdk}/bin
     runHook postInstall
   '';
 
@@ -28,14 +29,14 @@ stdenv.mkDerivation rec {
       CLI which makes it easy to create spring-based applications
     '';
     longDescription = ''
-      Spring Boot makes it easy to create stand-alone, production-grade 
-      Spring-based Applications that you can run. We take an opinionated view 
-      of the Spring platform and third-party libraries, so that you can get 
-      started with minimum fuss. Most Spring Boot applications need very 
+      Spring Boot makes it easy to create stand-alone, production-grade
+      Spring-based Applications that you can run. We take an opinionated view
+      of the Spring platform and third-party libraries, so that you can get
+      started with minimum fuss. Most Spring Boot applications need very
       little Spring configuration.
 
-      You can use Spring Boot to create Java applications that can be started 
-      by using java -jar or more traditional war deployments. We also provide 
+      You can use Spring Boot to create Java applications that can be started
+      by using java -jar or more traditional war deployments. We also provide
       a command line tool that runs “spring scripts”.
     '';
     homepage = "https://spring.io/projects/spring-boot";

pkgs/top-level/aliases.nix

@@ -532,6 +532,7 @@ mapAliases ({
   spice_gtk = spice-gtk; # added 2018-02-25
   spice_protocol = spice-protocol; # added 2018-02-25
   spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16
+  spring-boot = spring-boot-cli; # added 2020-04-24
   sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   squid4 = squid;  # added 2019-08-22

pkgs/top-level/all-packages.nix

@@ -16094,7 +16094,7 @@ in
 
   spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
 
-  spring-boot = callPackage ../development/tools/spring-boot { };
+  spring-boot-cli = callPackage ../development/tools/spring-boot-cli { };
 
   squid = callPackage ../servers/squid { };