From 8d30dcf773857575674c0c8c80f85beaa0da3668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 21 Nov 2021 11:47:34 +0100
Subject: [PATCH 1/3] fix compatibility with gradleGen in nixpkgs

---
 .../settings-buildscript/groovy/gradle-env.nix   | 16 ++++------------
 gradle-env.nix                                   | 15 ++++-----------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/fixtures/integration/settings-buildscript/groovy/gradle-env.nix b/fixtures/integration/settings-buildscript/groovy/gradle-env.nix
index 9c7f708..254ec25 100644
--- a/fixtures/integration/settings-buildscript/groovy/gradle-env.nix
+++ b/fixtures/integration/settings-buildscript/groovy/gradle-env.nix
@@ -19,7 +19,7 @@
 #         '';
 #       }
 
-{ stdenv, buildEnv, fetchurl, gradleGen, writeText, writeTextDir }:
+{ stdenv, buildEnv, fetchurl, gradleGen, writeText, writeTextDir, callPackage }:
 
 { envSpec
 , pname ? null
@@ -246,17 +246,9 @@ let
       '';
 
   mkGradle = gradleSpec:
-    gradleGen.gradleGen {
-      inherit (gradleSpec) nativeVersion;
-
-      name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
-
-      src = fetchurl {
-        inherit (gradleSpec) url sha256;
-      };
-    } // {
-      inherit (gradleSpec) version;
-    };
+    callPackage (gradleGen {
+      inherit (gradleSpec) nativeVersion version sha256;
+    }) {};
 
   mkProjectEnv = projectSpec: rec {
     inherit (projectSpec) name path version;
diff --git a/gradle-env.nix b/gradle-env.nix
index b512f90..1478bbd 100644
--- a/gradle-env.nix
+++ b/gradle-env.nix
@@ -25,6 +25,7 @@
 , fetchs3
 , fetchurl
 , gradleGen
+, callPackage
 , writeText
 , writeTextDir
 }:
@@ -325,17 +326,9 @@ let
       '';
 
   mkGradle = gradleSpec:
-    gradleGen.gradleGen {
-      inherit (gradleSpec) nativeVersion;
-
-      name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
-
-      src = fetchurl {
-        inherit (gradleSpec) url sha256;
-      };
-    } // {
-      inherit (gradleSpec) version;
-    };
+    callPackage (gradleGen {
+      inherit (gradleSpec) nativeVersion version sha256;
+    }) {};
 
   mkProjectEnv = projectSpec: rec {
     inherit (projectSpec) name path version;

From 9e940f68692cecba34fc94dada89ff7d52cfe57f Mon Sep 17 00:00:00 2001
From: Scoder12 <34356756+Scoder12@users.noreply.github.com>
Date: Mon, 17 Jan 2022 18:01:32 -0800
Subject: [PATCH 2/3] fix broken hahes in gradle-env.json

---
 gradle-env.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle-env.json b/gradle-env.json
index 347772c..3b906ae 100644
--- a/gradle-env.json
+++ b/gradle-env.json
@@ -7,7 +7,7 @@
       "version": "6.8.1",
       "type": "all",
       "url": "https://services.gradle.org/distributions/gradle-6.8.1-all.zip",
-      "sha256": "3db89524a3981819ff28c3f979236c1274a726e146ced0c8a2020417f9bc0782",
+      "sha256": "sha256-/VkaNK9zhXMJcDmfRzr6vbiyjVf9l9ZiXDiNCQA51v0=",
       "nativeVersion": "0.22-milestone-9"
     },
     "dependencies": {
@@ -71,7 +71,7 @@
           "urls": [
             "https://plugins.gradle.org/m2/com/fasterxml/jackson/jackson-parent/2.12/jackson-parent-2.12.pom"
           ],
-          "sha256": "62aa1c1679ade09f173dbf1b6c32d35c55e75800238fd5e48f13aa4337c0875b"
+          "sha256": "67be3dafaaf8ce1717e7a7de7db92ba433df923b697a40c9743a54cc9fc53637"
         },
         {
           "id": {
@@ -9523,4 +9523,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

From c17a7f56b5bb77e20fbec649895f0d5fb3d77fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 23 May 2022 17:16:14 +0000
Subject: [PATCH 3/3] bump nixpkgs

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6b80d16..4802600 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "lastModified": 1652776076,
+        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1607536117,
-        "narHash": "sha256-q3xr1fz93VNMnZjpqLN3VyphED2UxO6pd8jR8B4S+lo=",
+        "lastModified": 1653315696,
+        "narHash": "sha256-7tLCnzCz/fq86NEoF9+g/NkQRA2J+nkgytc7l2HuWnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8936e55235bb4a970514d4bb9fbd77a2c16b806",
+        "rev": "c11d9597c1b3cdc4fb44cbab48deec2cfbaa5281",
         "type": "github"
       },
       "original": {