From b021b23f9642283d900375b1b8f836f5c9764629 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 21 Feb 2026 17:53:36 +0800 Subject: [PATCH] mercury: move to by-name --- .../mercury/default.nix => by-name/me/mercury/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{development/compilers/mercury/default.nix => by-name/me/mercury/package.nix} (95%) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/by-name/me/mercury/package.nix similarity index 95% rename from pkgs/development/compilers/mercury/default.nix rename to pkgs/by-name/me/mercury/package.nix index 9e8cd70bc075..10a1d8b570c0 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/by-name/me/mercury/package.nix @@ -6,7 +6,7 @@ flex, bison, texinfo, - jdk_headless, + openjdk8_headless, erlang, makeWrapper, readline, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { flex bison texinfo - jdk_headless + openjdk8_headless erlang readline ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { for e in $(ls $out/bin) ; do wrapProgram $out/bin/$e \ --prefix PATH ":" "${gcc}/bin" \ - --prefix PATH ":" "${jdk_headless}/bin" \ + --prefix PATH ":" "${openjdk8_headless}/bin" \ --prefix PATH ":" "${erlang}/bin" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1172693508bf..db8615277228 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,10 +4580,6 @@ with pkgs; mkLLVMPackages ; - mercury = callPackage ../development/compilers/mercury { - jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - mitschemeX11 = mitscheme.override { enableX11 = true; };