refactor(nix): make sure ext contains only extensions

Moved sfcgal and mecab-naist-jdic from nix/ext to nix/packages.

Author: jfroche

flake.nix

@@ -30,7 +30,6 @@
         nix/checks.nix
         nix/config.nix
         nix/devShells.nix
-        nix/ext
         nix/fmt.nix
         nix/hooks.nix
         nix/nixpkgs.nix

nix/ext/default.nix

@@ -5,11 +5,12 @@
   pkg-config,
   postgresql,
   msgpack-c,
-  callPackage,
   mecab,
   makeWrapper,
   xxHash,
   buildEnv,
+  supabase-groonga,
+  mecab-naist-jdic,
 }:
 let
   pname = "pgroonga";
@@ -39,10 +40,6 @@ let
   # Build function for individual versions
   build =
     version: hash:
-    let
-      supabase-groonga = callPackage ./supabase-groonga-14.0.5.nix { };
-      mecab-naist-jdic = callPackage ../mecab-naist-jdic { };
-    in
     stdenv.mkDerivation rec {
       inherit pname version;
 

nix/ext/pgroonga/default.nix

@@ -62,7 +62,7 @@ self.inputs.nixpkgs.lib.nixos.runTest {
         package = psql_15;
       };
       systemd.services.postgresql.environment.MECAB_DICDIR = "${
-        self.packages.${pkgs.system}.mecab_naist_jdic
+        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 = "${

nix/ext/pgroonga/supabase-groonga-14.0.5.nix

@@ -12,6 +12,7 @@
       postgresql_orioledb-17
       supabase-groonga
       switch-ext-version
+      mecab-naist-jdic
       ;
 
     xmrig = throw "The xmrig package has been explicitly disabled in this flake.";

nix/ext/tests/pgroonga.nix

@@ -37,13 +37,15 @@
           supabase-groonga = pkgs.callPackage ./groonga { };
           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 { };
           migrate-tool = pkgs.callPackage ./migrate-tool.nix { psql_15 = self'.packages."psql_15/bin"; };
           overlayfs-on-package = pkgs.callPackage ./overlayfs-on-package.nix { };
           packer = pkgs.callPackage ./packer.nix { inherit inputs; };
           pg-restore = pkgs.callPackage ./pg-restore.nix { psql_15 = self'.packages."psql_15/bin"; };
           pg_prove = pkgs.perlPackages.TAPParserSourceHandlerpgTAP;
           pg_regress = makePgRegress activeVersion;
           run-testinfra = pkgs.callPackage ./run-testinfra.nix { };
+          sfcgal = pkgs.callPackage ./sfcgal.nix { };
           show-commands = pkgs.callPackage ./show-commands.nix { };
           start-client = pkgs.callPackage ./start-client.nix {
             psql_15 = self'.packages."psql_15/bin";

nix/overlays/default.nix

@@ -18,11 +18,8 @@
   lz4,
   zlibSupport ? true,
   zlib,
-  callPackage,
+  mecab-naist-jdic,
 }:
-let
-  mecab-naist-jdic = callPackage ../../ext/mecab-naist-jdic { };
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "supabase-groonga";
   version = "14.0.5";