From 18d56f8c1576f831e8c51c267b10caed35ca29c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Tue, 30 Dec 2025 20:01:27 +0100 Subject: [PATCH] clojure: migrate to by-name --- .../clojure/default.nix => by-name/cl/clojure/package.nix} | 2 ++ pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) rename pkgs/{development/interpreters/clojure/default.nix => by-name/cl/clojure/package.nix} (97%) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/by-name/cl/clojure/package.nix similarity index 97% rename from pkgs/development/interpreters/clojure/default.nix rename to pkgs/by-name/cl/clojure/package.nix index eadf0f60b41a..0e4ef2efe6f8 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/by-name/cl/clojure/package.nix @@ -4,6 +4,8 @@ bashNonInteractive, fetchurl, installShellFiles, + # Be careful if you remove this, out-of-tree consumers expect to + # be able to override `jdk`. jdk, rlwrap, makeWrapper, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25b3fab9f79d..a1e5c624088c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5353,13 +5353,6 @@ with pkgs; xeus-cling ; - 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; - }; - dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall; dhall-bash = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-bash;