From eb290d87d3bc06f763b4455341606509b7b845eb Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:41:41 -0800 Subject: [PATCH 1/2] gradle_4: remove --- pkgs/development/tools/build-managers/gradle/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 7e34249f2075..a023a8ef2861 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -148,11 +148,4 @@ rec { sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; defaultJava = jdk11; }; - - gradle_4 = gen { - version = "4.10.3"; - nativeVersion = "0.14"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - defaultJava = jdk8; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26425485f648..086b24eb1eb4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -584,6 +584,7 @@ mapAliases ({ graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 + gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5f68fb7faf1..9119d8e9d24c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17625,7 +17625,6 @@ with pkgs; inherit jdk8 jdk11 jdk17; }; gradleGen = gradle-packages.gen; - gradle_4 = callPackage gradle-packages.gradle_4 { }; gradle_5 = callPackage gradle-packages.gradle_5 { }; gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_7 = callPackage gradle-packages.gradle_7 { }; From ce3a7f8d88d30f8047696326e5a3c58c9d187e8f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 17 Jan 2023 11:56:31 -0800 Subject: [PATCH 2/2] gradle_5: remove --- pkgs/development/tools/build-managers/gradle/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a023a8ef2861..d8a797dc9189 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -139,13 +139,4 @@ rec { sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; defaultJava = jdk11; }; - - # NOTE: No GitHub Release for the following versions. `update.sh` will not work. - - gradle_5 = gen { - version = "5.6.4"; - nativeVersion = "0.18"; - sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; - defaultJava = jdk11; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 086b24eb1eb4..8aaa0fcc32cc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -585,6 +585,7 @@ mapAliases ({ graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 + gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9119d8e9d24c..1598373545bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17625,7 +17625,6 @@ with pkgs; inherit jdk8 jdk11 jdk17; }; gradleGen = gradle-packages.gen; - gradle_5 = callPackage gradle-packages.gradle_5 { }; gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7;