Skip to content

Commit 5f30f41

Browse files
committed
fix(exts): remove remaining duplicated files
Move pgrouting.nix to pgrouting/default.nix and groonga package to pgroonga/groonga.nix. Update imports and fix relative paths for versions.json and patch files.
1 parent d631d43 commit 5f30f41

File tree

6 files changed

+4
-40
lines changed

6 files changed

+4
-40
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let
1212
pname = "pgrouting";
1313

1414
# Load version configuration from external file
15-
allVersions = (builtins.fromJSON (builtins.readFile ./versions.json)).${pname};
15+
allVersions = (builtins.fromJSON (builtins.readFile ../versions.json)).${pname};
1616

1717
# Filter versions compatible with current PostgreSQL version
1818
supportedVersions = lib.filterAttrs (
@@ -50,7 +50,7 @@ let
5050
};
5151

5252
patches = lib.optionals (version == "3.4.1" && lib.versionAtLeast postgresql.version "17") [
53-
./pgrouting/pgrouting-3.4.1-pg17.patch
53+
./pgrouting-3.4.1-pg17.patch
5454
];
5555

5656
#disable compile time warnings for incompatible pointer types only on macos and pg16

nix/packages/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
github-matrix = pkgs.callPackage ./github-matrix {
3737
nix-eval-jobs = inputs'.nix-eval-jobs.packages.default;
3838
};
39-
supabase-groonga = pkgs.callPackage ./groonga { };
39+
supabase-groonga = pkgs.callPackage ../ext/pgroonga/groonga.nix { };
4040
http-mock-server = pkgs.callPackage ./http-mock-server.nix { };
4141
local-infra-bootstrap = pkgs.callPackage ./local-infra-bootstrap.nix { };
4242
mecab-naist-jdic = pkgs.callPackage ./mecab-naist-jdic.nix { };

nix/packages/groonga/do-not-use-vendored-libraries.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

nix/packages/groonga/fix-cmake-install-path.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

nix/packages/postgres.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
../ext/pgjwt.nix
2626
../ext/pgaudit.nix
2727
../ext/postgis.nix
28-
../ext/pgrouting.nix
28+
../ext/pgrouting
2929
../ext/pgtap.nix
3030
../ext/pg_cron
3131
../ext/pgsql-http.nix

0 commit comments

Comments
 (0)