Revert "refactor(groonga): move groonga package to pgroonga extension"

This reverts commit cfa9bcb92219f391469ae743f95c8856b0a99561.

Author: yvan-sraka

nix/checks.nix

@@ -172,6 +172,7 @@
                 start-postgres-server-bin
                 which
                 getkey-script
+                supabase-groonga
                 python3
                 netcat
               ];
@@ -257,7 +258,7 @@
                 export HTTP_MOCK_PORT
 
                 #First we need to create a generic pg cluster for pgtap tests and run those
-                export GRN_PLUGINS_DIR=${pgroonga.passthru.groonga}/lib/groonga/plugins
+                export GRN_PLUGINS_DIR=${pkgs.supabase-groonga}/lib/groonga/plugins
                 PGTAP_CLUSTER=$(mktemp -d)
                 log info "Creating temporary PostgreSQL cluster at $PGTAP_CLUSTER"
                 log_cmd initdb --locale=C --username=supabase_admin -D "$PGTAP_CLUSTER"

nix/ext/pgroonga/default.nix

@@ -9,13 +9,10 @@
   makeWrapper,
   xxHash,
   buildEnv,
+  supabase-groonga,
   mecab-naist-jdic,
-  callPackage,
 }:
 let
-  # Import groonga locally since it's only used by pgroonga
-  supabase-groonga = callPackage ./groonga.nix { };
-
   pname = "pgroonga";
 
   # Load version configuration from external file
@@ -174,13 +171,7 @@ buildEnv {
   '';
 
   passthru = {
-    inherit
-      versions
-      numberOfVersions
-      pname
-      supabase-groonga
-      ;
-    groonga = supabase-groonga;
+    inherit versions numberOfVersions pname;
     version =
       "multi-" + lib.concatStringsSep "-" (map (v: lib.replaceStrings [ "." ] [ "-" ] v) versions);
   };

nix/ext/tests/pgroonga.nix

@@ -84,8 +84,9 @@ self.inputs.nixpkgs.lib.nixos.runTest {
         self.packages.${pkgs.system}.mecab-naist-jdic
       }/lib/mecab/dic/naist-jdic";
       systemd.services.postgresql.environment.MECAB_CONFIG = "${pkgs.mecab}/bin/mecab-config";
-      systemd.services.postgresql.environment.GRN_PLUGINS_DIR =
-        "${(installedExtension "15").passthru.groonga}/lib/groonga/plugins";
+      systemd.services.postgresql.environment.GRN_PLUGINS_DIR = "${
+        self.packages.${pkgs.system}.supabase-groonga
+      }/lib/groonga/plugins";
 
       specialisation.postgresql17.configuration = {
         services.postgresql = {

nix/overlays/default.nix

@@ -10,7 +10,7 @@
       postgresql_15
       postgresql_17
       postgresql_orioledb-17
-
+      supabase-groonga
       switch-ext-version
       mecab-naist-jdic
       ;

nix/packages/default.nix

@@ -41,7 +41,7 @@
           github-matrix = pkgs.callPackage ./github-matrix {
             nix-eval-jobs = inputs'.nix-eval-jobs.packages.default;
           };
-
+          supabase-groonga = pkgs.callPackage ../ext/pgroonga/groonga.nix { };
           http-mock-server = pkgs.callPackage ./http-mock-server.nix { };
           local-infra-bootstrap = pkgs.callPackage ./local-infra-bootstrap.nix { };
           mecab-naist-jdic = pkgs.callPackage ./mecab-naist-jdic.nix { };

nix/packages/lib.nix

@@ -3,6 +3,7 @@
   psql_15,
   psql_orioledb-17,
   defaults,
+  supabase-groonga,
   system,
 }:
 {
@@ -14,7 +15,6 @@
       extraSubstitutions ? { },
     }:
     let
-      supabase-groonga = pgroonga.passthru.groonga or (pkgs.callPackage ../ext/pgroonga/groonga.nix { });
       paths = {
         migrationsDir = builtins.path {
           name = "migrations";