clojure: restore `jdk` with override in all-packages

This broke some out-of-tree packages that expect
to be able to override a `jdk` attribute.

See the discussion at
https://github.com/NixOS/nixpkgs/commit/a4dd7db0dc40f13289806c91c67a8bdd6f38ce96#commitcomment-166836083

Changed files
+7 -6
pkgs
development
interpreters
clojure
top-level
+1 -5
pkgs/development/interpreters/clojure/default.nix
···
bashNonInteractive,
fetchurl,
installShellFiles,
-
jdk21,
+
jdk,
rlwrap,
makeWrapper,
writeScript,
}:
-
let
-
# set this to an LTS version of java
-
jdk = jdk21;
-
in
stdenv.mkDerivation (finalAttrs: {
pname = "clojure";
version = "1.12.2.1565";
+6 -1
pkgs/top-level/all-packages.nix
···
xeus-cling
-
clojure = callPackage ../development/interpreters/clojure { };
+
clojure = callPackage ../development/interpreters/clojure {
+
# set this to an LTS version of java
+
# Be careful if you remove this, out-of-tree consumers expect to
+
# be able to override `jdk`.
+
jdk = jdk21;
+
};
clooj = callPackage ../development/interpreters/clojure/clooj.nix { };