From 8496210f3d38c148e950c7e45134267da5b19add Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:53:43 -0400 Subject: [PATCH] idris2: Move to by-name --- .../idris2/idris2.nix => by-name/id/idris2/package.nix} | 0 pkgs/{development/compilers => by-name/id}/idris2/tests.nix | 0 pkgs/development/compilers/idris2/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/compilers/idris2/idris2.nix => by-name/id/idris2/package.nix} (100%) rename pkgs/{development/compilers => by-name/id}/idris2/tests.nix (100%) diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/by-name/id/idris2/package.nix similarity index 100% rename from pkgs/development/compilers/idris2/idris2.nix rename to pkgs/by-name/id/idris2/package.nix diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix similarity index 100% rename from pkgs/development/compilers/idris2/tests.nix rename to pkgs/by-name/id/idris2/tests.nix diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 57031f673d3e..1083a9b653f8 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,10 +1,8 @@ -{ callPackage }: +{ callPackage, idris2 }: { - idris2 = callPackage ./idris2.nix { }; + inherit idris2; idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; - pack = callPackage ./pack.nix { }; - buildIdris = callPackage ./build-idris.nix { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c967d8f89074..4c4bf0ac88c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5048,8 +5048,6 @@ with pkgs; idris2Packages = recurseIntoAttrs (callPackage ../development/compilers/idris2 { }); - inherit (idris2Packages) idris2; - inherit (callPackage ../development/tools/database/indradb { }) indradb-server indradb-client