From 21821de828bc1e8af653930c43700da29d7399f9 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Sat, 14 Mar 2020 22:39:56 -0400
Subject: [PATCH] spring-boot-cli: 2.1.9->2.2.5

---
 .../default.nix                               | 25 ++++++++++---------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)
 rename pkgs/development/tools/{spring-boot => spring-boot-cli}/default.nix (75%)

diff --git a/pkgs/development/tools/spring-boot/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix
similarity index 75%
rename from pkgs/development/tools/spring-boot/default.nix
rename to pkgs/development/tools/spring-boot-cli/default.nix
index 4f8c17caeee75f..865c655e67f8fc 100644
--- a/pkgs/development/tools/spring-boot/default.nix
+++ b/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";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4837995d11a74c..66a2e36fa15f99 100644
--- a/pkgs/top-level/aliases.nix
+++ b/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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5c9d3d0f687fa..8af1e473bff0e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 { };