Unverified Commit 5c45d8c8 authored by Tomodachi94's avatar Tomodachi94 Committed by GitHub
Browse files

clojure: restore `jdk` with override in all-packages (#447873)

parents f71c02f8 dbd909b3

pkgs/development/interpreters/clojure/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -4,15 +4,11 @@ 
  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";

pkgs/top-level/all-packages.nix

+6 −1
Original line number Diff line number Diff line
@@ -5812,7 +5812,12 @@ with pkgs; 
    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 { };