Skip to content

Commit 852cbcc

Browse files
committed
fix: drop legacy string
1 parent 87afdb9 commit 852cbcc

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

nix/checks.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}:
1111
let
1212
pkgs-lib = pkgs.callPackage ./packages/lib.nix {
13-
psql_legacy-14 = self'.packages."psql_legacy-14/bin";
13+
psql_14 = self'.packages."psql_14/bin";
1414
psql_15 = self'.packages."psql_15/bin";
1515
psql_17 = self'.packages."psql_17/bin";
1616
psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
@@ -302,7 +302,7 @@
302302
psql_15 = makeCheckHarness self'.packages."psql_15/bin";
303303
psql_17 = makeCheckHarness self'.packages."psql_17/bin";
304304
psql_orioledb-17 = makeCheckHarness self'.packages."psql_orioledb-17/bin";
305-
psql_legacy-14 = makeCheckHarness self'.packages."psql_legacy-14/bin";
305+
psql_14 = makeCheckHarness self'.packages."psql_14/bin";
306306
inherit (self'.packages)
307307
wal-g-2
308308
wal-g-3

nix/packages/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
pkgs.callPackage ../ext/pg_regress.nix { postgresql = postgresqlPackage; };
2121
pgsqlSuperuser = "supabase_admin";
2222
pkgs-lib = pkgs.callPackage ./lib.nix {
23-
psql_legacy-14 = self'.packages."psql_legacy-14/bin";
23+
psql_14 = self'.packages."psql_14/bin";
2424
psql_15 = self'.packages."psql_15/bin";
2525
psql_17 = self'.packages."psql_17/bin";
2626
psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";
@@ -44,7 +44,7 @@
4444
run-testinfra = pkgs.callPackage ./run-testinfra.nix { };
4545
show-commands = pkgs.callPackage ./show-commands.nix { };
4646
start-client = pkgs.callPackage ./start-client.nix {
47-
psql_legacy-14 = self'.packages."psql_legacy-14/bin";
47+
psql_14 = self'.packages."psql_14/bin";
4848
psql_15 = self'.packages."psql_15/bin";
4949
psql_17 = self'.packages."psql_17/bin";
5050
psql_orioledb-17 = self'.packages."psql_orioledb-17/bin";

nix/packages/lib.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
psql_17,
33
psql_15,
4-
psql_legacy-14,
4+
psql_14,
55
psql_orioledb-17,
66
defaults,
77
supabase-groonga,
@@ -77,7 +77,7 @@
7777
SHELL_PATH = "${pkgs.bash}/bin/bash";
7878
PGSQL_DEFAULT_PORT = "${defaults.port}";
7979
PGSQL_SUPERUSER = "${defaults.superuser}";
80-
PSQL14_BINDIR = "${psql_legacy-14}";
80+
PSQL14_BINDIR = "${psql_14}";
8181
PSQL15_BINDIR = "${psql_15}";
8282
PSQL17_BINDIR = "${psql_17}";
8383
PSQL_CONF_FILE = "${paths.pgconfigFile}";

nix/packages/postgres.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
recurseForDerivations = true;
166166
};
167167
basePackages = {
168-
psql_legacy-14 = makePostgres "14";
168+
psql_14 = makePostgres "14";
169169
psql_15 = makePostgres "15";
170170
psql_17 = makePostgres "17";
171171
psql_orioledb-17 = makePostgres "orioledb-17";

nix/packages/start-client.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
runCommand,
3-
psql_legacy-14,
3+
psql_14,
44
psql_15,
55
psql_17,
66
psql_orioledb-17,
@@ -17,7 +17,7 @@ runCommand "start-postgres-client" { } ''
1717
substitute ${../tools/run-client.sh.in} $out/bin/start-postgres-client \
1818
--subst-var-by 'PGSQL_DEFAULT_PORT' '${defaults.port}' \
1919
--subst-var-by 'PGSQL_SUPERUSER' '${defaults.superuser}' \
20-
--subst-var-by 'PSQL14_BINDIR' '${psql_legacy-14}' \
20+
--subst-var-by 'PSQL14_BINDIR' '${psql_14}' \
2121
--subst-var-by 'PSQL15_BINDIR' '${psql_15}' \
2222
--subst-var-by 'PSQL17_BINDIR' '${psql_17}' \
2323
--subst-var-by 'PSQLORIOLEDB17_BINDIR' '${psql_orioledb-17}' \

0 commit comments

Comments
 (0)