21.11 Beta Release

.version

@@ -1 +1 @@
-22.05
+21.11

nixos/modules/misc/version.nix

@@ -76,7 +76,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = "https://nixos.org/channels/nixos-unstable";
+      default = "https://nixos.org/channels/nixos-21.11";
       description = "Default NixOS channel to which the root user is subscribed.";
     };
 

nixos/release.nix

@@ -1,6 +1,6 @@
 with import ../lib;
 
-{ nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
+{ nixpkgs ? { outPath = cleanSource ./..; revCount = 333507; shortRev = "8bcc413"; }
 , stableBranch ? false
 , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
 , configuration ? {}
@@ -12,7 +12,7 @@ let
 
   version = fileContents ../.version;
   versionSuffix =
-    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+    (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
   # Run the tests for each platform.  You can run a test by doing
   # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,

pkgs/development/compilers/openjdk/openjfx/11.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake
+{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
 , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby
 , openjdk11-bootstrap }:
 
@@ -7,9 +7,9 @@ let
   update = ".0.3";
   build = "1";
   repover = "${major}${update}+${build}";
-  gradle_ = (gradle_4.override {
+  gradle_ = (gradleGen.override {
     java = openjdk11-bootstrap;
-  });
+  }).gradle_4_10;
 
   makePackage = args: stdenv.mkDerivation ({
     version = "${major}${update}-${build}";

pkgs/development/compilers/openjdk/openjfx/15.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5
+{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
 , ffmpeg, python3, ruby }:
 
@@ -7,9 +7,9 @@ let
   update = ".0.1";
   build = "+1";
   repover = "${major}${update}${build}";
-  gradle_ = (gradle_5.override {
+  gradle_ = (gradleGen.override {
     java = openjdk11_headless;
-  });
+  }).gradle_5_6;
 
   makePackage = args: stdenv.mkDerivation ({
     version = "${major}${update}${build}";

pkgs/development/python-modules/aiomusiccast/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "aiomusiccast";
-  version = "0.14.0";
+  version = "0.13.1";
 
   format = "pyproject";
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "vigonotion";
     repo = "aiomusiccast";
     rev = version;
-    sha256 = "sha256-Zb2wwqKXtXlPvfmDNOlTHho9zHFFJOQxqoeqL//Z69M=";
+    sha256 = "sha256-y1rt2/nCi2xcNPMEqFGDv4ylWRXv2vfnA3++Qc2aWew=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/aionanoleaf/default.nix

@@ -7,8 +7,7 @@
 
 buildPythonPackage rec {
   pname = "aionanoleaf";
-  version = "0.0.4";
-  format = "setuptools";
+  version = "0.0.3";
 
   disabled = pythonOlder "3.8";
 
@@ -16,7 +15,7 @@ buildPythonPackage rec {
     owner = "milanmeu";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Ys6zFfS0R3L504fkMVZvt1IjCzLoT1OEW/OOCaXp7dw=";
+    sha256 = "sha256-fUVpPxaeuvuw9ZX5fc2Jc/LdBDhCRdFlghvhSmBK/z0=";
   };
 
   propagatedBuildInputs = [
@@ -26,9 +25,7 @@ buildPythonPackage rec {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "aionanoleaf"
-  ];
+  pythonImportsCheck = [ "aionanoleaf" ];
 
   meta = with lib; {
     description = "Python wrapper for the Nanoleaf API";

pkgs/development/python-modules/pysaml2/default.nix

@@ -1,60 +1,27 @@
 { lib
 , buildPythonPackage
-, cryptography
-, defusedxml
+, isPy3k
 , fetchFromGitHub
-, importlib-resources
-, mock
-, pyasn1
-, pymongo
-, pyopenssl
-, pytestCheckHook
-, python-dateutil
-, pythonOlder
-, pytz
-, requests
-, responses
-, six
 , substituteAll
-, xmlschema
 , xmlsec
+, cryptography, defusedxml, pyopenssl, python-dateutil, pytz, requests, six
+, mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources
 }:
 
 buildPythonPackage rec {
   pname = "pysaml2";
-  version = "7.1.0";
-  format = "setuptools";
+  version = "7.0.1";
 
-  disabled = pythonOlder "3.6";
+  disabled = !isPy3k;
 
+  # No tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "IdentityPython";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3Yl6j6KAlw7QQYnwU7+naY6D97IqX766zguekKAuic8=";
+    sha256 = "0ickqask6bjipgi3pvxg92pjr6dk2rr3q9garap39mdrp2gsfhln";
   };
 
-  propagatedBuildInputs = [
-    cryptography
-    python-dateutil
-    defusedxml
-    pyopenssl
-    pytz
-    requests
-    six
-    xmlschema
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    importlib-resources
-  ];
-
-  checkInputs = [
-    mock
-    pyasn1
-    pymongo
-    pytestCheckHook
-    responses
-  ];
-
   patches = [
     (substituteAll {
       src = ./hardcode-xmlsec1-path.patch;
@@ -67,22 +34,32 @@ buildPythonPackage rec {
     sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
   '';
 
-  disabledTests = [
-    # Disabled tests try to access the network
-    "test_load_extern_incommon"
-    "test_load_remote_encoding"
-    "test_load_external"
-    "test_conf_syslog"
+  propagatedBuildInputs = [
+    cryptography
+    python-dateutil
+    defusedxml
+    importlib-resources
+    pyopenssl
+    pytz
+    requests
+    six
+    xmlschema
   ];
 
-  pythonImportsCheck = [
-    "saml2"
-  ];
+  checkInputs = [ mock pyasn1 pymongo pytest responses ];
+
+  # Disabled tests try to access the network
+  checkPhase = ''
+    py.test -k "not test_load_extern_incommon \
+            and not test_load_remote_encoding \
+            and not test_load_external \
+            and not test_conf_syslog"
+  '';
 
   meta = with lib; {
+    homepage = "https://github.com/rohe/pysaml2";
     description = "Python implementation of SAML Version 2 Standard";
-    homepage = "https://github.com/IdentityPython/pysaml2";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
   };
+
 }

pkgs/development/python-modules/pytado/default.nix

@@ -1,36 +1,19 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pytestCheckHook
-, requests
-}:
+{ lib, buildPythonPackage, fetchFromGitHub }:
 
 buildPythonPackage rec {
-  pname = "pytado";
-  version = "0.13.0";
+  pname = "PyTado";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "wmalgadey";
-    repo = "PyTado";
-    # Upstream hasn't tagged 0.13.0 yet
-    rev = "2a243174e9ae01ef7adae940ecc6e340992ab28d";
-    sha256 = "Y1FxEzs/AF0ZTPdOK/1v+2U2fidfu+AmZbPddJCWIFc=";
+    repo = pname;
+    # Upstream hasn't tagged this release yet. This commit fixes the build.
+    rev = "79a5dfdf75cd9a3e1a1ee8a8ff0d08923aebda7b";
+    sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0";
   };
 
-  propagatedBuildInputs = [
-    requests
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [
-    "PyTado"
-  ];
-
   meta = with lib; {
-    description = "Python binding for Tado web API";
+    description = "Python binding for Tado web API. Pythonize your central heating!";
     homepage = "https://github.com/wmalgadey/PyTado";
     license = licenses.gpl3;
     maintainers = with maintainers; [ elseym ];

pkgs/development/python-modules/qcs-api-client/default.nix

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "qcs-api-client";
-  version = "0.20.1";
+  version = "0.20.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rlDquNKWnmP8d3pxmFfViDN++8x59h6bGXBJv//q/dk=";
+    sha256 = "sha256-l6n/DUEWIBmnPvt5+TAZ2RnFrYEUwh4nIZa6aQG2lJ0=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/sendgrid/default.nix

@@ -11,14 +11,13 @@
 
 buildPythonPackage rec {
   pname = "sendgrid";
-  version = "6.9.1";
-  format = "setuptools";
+  version = "6.8.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "sendgrid-python";
     rev = version;
-    sha256 = "sha256-u7qakmJ9pKV1zonILEvMHxzMF6EaY+ZJUfh5s3TTH5w=";
+    sha256 = "sha256-kJbpYLM+GpyAHEnO2mqULOYyxIpOrmGeSMd4wJccz/8=";
   };
 
   propagatedBuildInputs = [
@@ -39,14 +38,14 @@ buildPythonPackage rec {
     "--ignore live_test.py"
   ];
 
-  pythonImportsCheck = [
-    "sendgrid"
-  ];
+  pythonImportsCheck = [ "sendgrid" ];
 
   meta = with lib; {
     description = "Python client for SendGrid";
     homepage = "https://github.com/sendgrid/sendgrid-python";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
+    # No support for new starkbank-ecdsa releases
+    broken = true;
   };
 }

pkgs/development/python-modules/sepaxml/default.nix

@@ -1,25 +1,20 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
 , lxml
-, pytestCheckHook
+, pytest
 , text-unidecode
 , xmlschema
 }:
 
 buildPythonPackage rec {
+  version = "2.2.0";
   pname = "sepaxml";
-  version = "2.4.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "python-sepaxml";
     rev = version;
-    sha256 = "sha256-Up6zHm20tc6+lQk958csdgC4FMJFhdt+oAJcNcVbcjk=";
+    sha256 = "1qmgdcz61hs65m2fddwn9jpyk2sxifdb0f3jz1n0lgy774z0pmas";
   };
 
   propagatedBuildInputs = [
@@ -27,18 +22,15 @@ buildPythonPackage rec {
     xmlschema
   ];
 
-  checkInputs = [
-    pytestCheckHook
-    lxml
-  ];
+  checkInputs = [ pytest lxml ];
 
-  pythonImportsCheck = [
-    "sepaxml"
-  ];
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with lib; {
-    description = "SEPA Direct Debit XML generation in python";
     homepage = "https://github.com/raphaelm/python-sepaxml/";
+    description = "SEPA Direct Debit XML generation in python";
     license = licenses.mit;
     maintainers = with maintainers; [ elohmeier ];
   };

pkgs/development/python-modules/smbprotocol/default.nix

@@ -12,16 +12,14 @@
 
 buildPythonPackage rec {
   pname = "smbprotocol";
-  version = "1.8.3";
-  format = "setuptools";
-
+  version = "1.8.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-m9C+uzwrEOcbkvBQ3Z+to2BsX2i7cLnUiV/+L7hMUdE=";
+    sha256 = "sha256-NBwfWW02lzR4Xk+7qodQX+eIXMTtdy9WOtLzsf30d4c=";
   };
 
   propagatedBuildInputs = [
@@ -45,9 +43,7 @@ buildPythonPackage rec {
     "test_recv_"
   ];
 
-  pythonImportsCheck = [
-    "smbprotocol"
-  ];
+  pythonImportsCheck = [ "smbprotocol" ];
 
   meta = with lib; {
     description = "Python SMBv2 and v3 Client";

pkgs/development/tools/build-managers/gradle/default.nix

@@ -1,119 +1,73 @@
-{ jdk8, jdk11, jdk17 }:
+{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
 
 rec {
-  gen =
+  gradleGen = { version, nativeVersion, sha256 }: stdenv.mkDerivation {
+    pname = "gradle";
+    inherit version;
 
-    { version, nativeVersion, sha256, defaultJava ? jdk8 }:
-
-    { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
-    , javaToolchains ? [ ] }:
-
-    stdenv.mkDerivation rec {
-      pname = "gradle";
-      inherit version;
-
-      src = fetchurl {
-        inherit sha256;
-        url =
-          "https://services.gradle.org/distributions/gradle-${version}-bin.zip";
-      };
-
-      dontBuild = true;
-
-      nativeBuildInputs = [ makeWrapper unzip ];
-      buildInputs = [ java ];
-
-      # NOTE: For more information on toolchains,
-      # see https://docs.gradle.org/current/userguide/toolchains.html
-      installPhase = with builtins;
-        let
-          toolchain = rec {
-            var = x: "JAVA_TOOLCHAIN_NIX_${toString x}";
-            vars = (lib.imap0 (i: x: ("${var i} ${x}")) javaToolchains);
-            varNames = lib.imap0 (i: x: var i) javaToolchains;
-            property = " -Porg.gradle.java.installations.fromEnv='${
-                 concatStringsSep "," varNames
-               }'";
-          };
-          vars = concatStringsSep "\n" (map (x: "  --set ${x} \\")
-            ([ "JAVA_HOME ${java}" ] ++ toolchain.vars));
-        in ''
-          mkdir -pv $out/lib/gradle/
-          cp -rv lib/ $out/lib/gradle/
-
-          gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
-          test -f $gradle_launcher_jar
-          makeWrapper ${java}/bin/java $out/bin/gradle \
-            ${vars}
-            --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"
-        '';
-
-      dontFixup = !stdenv.isLinux;
-
-      fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386";
-      in ''
-        mkdir patching
-        pushd patching
-        jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
-        patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
-        jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
-        mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
-        popd
-
-        # The scanner doesn't pick up the runtime dependency in the jar.
-        # Manually add a reference where it will be found.
-        mkdir $out/nix-support
-        echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
-      '';
-
-      meta = with lib; {
-        description = "Enterprise-grade build system";
-        longDescription = ''
-          Gradle is a build system which offers you ease, power and freedom.
-          You can choose the balance for yourself. It has powerful multi-project
-          build support. It has a layer on top of Ivy that provides a
-          build-by-convention integration for Ivy. It gives you always the choice
-          between the flexibility of Ant and the convenience of a
-          build-by-convention behavior.
-        '';
-        homepage = "https://www.gradle.org/";
-        changelog = "https://docs.gradle.org/${version}/release-notes.html";
-        downloadPage = "https://gradle.org/next-steps/?version=${version}";
-        license = licenses.asl20;
-        platforms = platforms.unix;
-        maintainers = with maintainers; [ lorenzleutgeb ];
-      };
+    src = fetchurl {
+      inherit sha256;
+      url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip";
     };
 
-  # NOTE: Default JDKs are LTS versions and according to
-  # https://docs.gradle.org/current/userguide/compatibility.html
+    dontBuild = true;
 
-  gradle_7 = gen {
-    version = "7.3";
-    nativeVersion = "0.22-milestone-21";
-    sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
-    defaultJava = jdk17;
+    nativeBuildInputs = [ makeWrapper unzip ];
+    buildInputs = [ java ];
+
+    installPhase = ''
+      mkdir -pv $out/lib/gradle/
+      cp -rv lib/ $out/lib/gradle/
+
+      gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
+      test -f $gradle_launcher_jar
+      makeWrapper ${java}/bin/java $out/bin/gradle \
+        --set JAVA_HOME ${java} \
+        --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
+    '';
+
+    fixupPhase = if (!stdenv.isLinux) then ":" else
+    let arch = if stdenv.is64bit then "amd64" else "i386"; in
+    ''
+      mkdir patching
+      pushd patching
+      jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
+      patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
+      jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
+      mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
+      popd
+
+      # The scanner doesn't pick up the runtime dependency in the jar.
+      # Manually add a reference where it will be found.
+      mkdir $out/nix-support
+      echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
+    '';
+
+    meta = with lib; {
+      description = "Enterprise-grade build system";
+      longDescription = ''
+        Gradle is a build system which offers you ease, power and freedom.
+        You can choose the balance for yourself. It has powerful multi-project
+        build support. It has a layer on top of Ivy that provides a
+        build-by-convention integration for Ivy. It gives you always the choice
+        between the flexibility of Ant and the convenience of a
+        build-by-convention behavior.
+      '';
+      homepage = "https://www.gradle.org/";
+      changelog = "https://docs.gradle.org/${version}/release-notes.html";
+      downloadPage = "https://gradle.org/next-steps/?version=${version}";
+      license = licenses.asl20;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ lorenzleutgeb ];
+    };
   };
 
-  gradle_6 = gen {
-    version = "6.9.1";
-    nativeVersion = "0.22-milestone-20";
-    sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
-    defaultJava = jdk11;
-  };
+  gradle_latest = gradle_7_3;
 
-  # 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;
-  };
+  gradle_7_3 = gradleGen (import ./gradle-7.3-spec.nix);
+  gradle_6_9 = gradleGen (import ./gradle-6.9.1-spec.nix);
 
-  gradle_4 = gen {
-    version = "4.10.3";
-    nativeVersion = "0.14";
-    sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
-    defaultJava = jdk8;
-  };
+  # NOTE: No GitHub Release for the following versions. Update.sh will not work.
+  gradle_5_6 = gradleGen (import ./gradle-5.6.4-spec.nix);
+  gradle_4_10 = gradleGen (import ./gradle-4.10.3-spec.nix);
 }

pkgs/development/tools/build-managers/gradle/gradle-4.10.3-spec.nix

@@ -0,0 +1,5 @@
+{
+  version = "4.10.3";
+  nativeVersion = "0.14";
+  sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
+}

pkgs/development/tools/build-managers/gradle/gradle-5.6.4-spec.nix

@@ -0,0 +1,5 @@
+{
+  version = "5.6.4";
+  nativeVersion = "0.18";
+  sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
+}

pkgs/development/tools/build-managers/gradle/gradle-6.9.1-spec.nix

@@ -0,0 +1,5 @@
+{
+  version = "6.9.1";
+  nativeVersion = "0.22-milestone-20";
+  sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
+}

pkgs/development/tools/build-managers/gradle/gradle-7.2-spec.nix

@@ -0,0 +1,5 @@
+{
+  version = "7.2";
+  nativeVersion = "0.22-milestone-21";
+  sha256 = "1pg6w5czysywsgdvmll5bwd2p6y99cn5sn3gw69cps9mkjd710gm";
+}

pkgs/development/tools/build-managers/gradle/gradle-7.3-spec.nix

@@ -0,0 +1,5 @@
+{
+  version = "7.3";
+  nativeVersion = "0.22-milestone-21";
+  sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
+}

pkgs/development/tools/scenebuilder/default.nix

@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, jdk11, gradle_6, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
+{ lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
 let
-  gradle = gradle_6;
+  gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_9;
 
   pname = "scenebuilder";
   version = "15.0.1";

pkgs/development/tools/scenic-view/default.nix

@@ -1,5 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, jdk, gradle, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
 let
+  # The default one still uses jdk8 (#89731)
+  gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
+
   pname = "scenic-view";
   version = "11.0.2";
 

pkgs/games/mindustry/default.nix

@@ -3,8 +3,8 @@
 , makeDesktopItem
 , copyDesktopItems
 , fetchFromGitHub
-, gradle_6
-, jdk11
+, gradleGen
+, jdk
 , perl
 
 # for arc
@@ -87,8 +87,8 @@ let
     popd
   '';
 
-  jdk = jdk11;
-  gradle = (gradle_6.override (old: { java = jdk11; }));
+  # The default one still uses jdk8 (#89731)
+  gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_9;
 
   # fake build to pre-download deps into fixed-output derivation
   deps = stdenv.mkDerivation {
@@ -96,7 +96,7 @@ let
     inherit version unpackPhase patches;
     postPatch = cleanupMindustrySrc;
 
-    nativeBuildInputs = [ gradle perl ];
+    nativeBuildInputs = [ gradle_6 perl ];
     # Here we download dependencies for both the server and the client so
     # we only have to specify one hash for 'deps'. Deps can be garbage
     # collected after the build, so this is not really an issue.
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [
     pkg-config
-    gradle
+    gradle_6
     makeWrapper
     jdk
   ] ++ lib.optionals enableClient [

pkgs/top-level/all-packages.nix

@@ -14652,15 +14652,14 @@ with pkgs;
 
   gpuvis = callPackage ../development/tools/misc/gpuvis { };
 
-  gradle-packages = import ../development/tools/build-managers/gradle {
-    inherit jdk8 jdk11 jdk17;
+  gradleGen = callPackage ../development/tools/build-managers/gradle {
+    java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
   };
-  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 { };
-  gradle = gradle_7;
+  gradle = res.gradleGen.gradle_latest;
+  gradle_4 = res.gradleGen.gradle_4_10;
+  gradle_5 = res.gradleGen.gradle_5_6;
+  gradle_6 = res.gradleGen.gradle_6_9;
+  gradle_7 = res.gradleGen.gradle_7_3;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.