File tree Expand file tree Collapse file tree 5 files changed +9
-9
lines changed Expand file tree Collapse file tree 5 files changed +9
-9
lines changed Original file line number Diff line number Diff line change 10
10
} :
11
11
let
12
12
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" ;
14
14
psql_15 = self' . packages . "psql_15/bin" ;
15
15
psql_17 = self' . packages . "psql_17/bin" ;
16
16
psql_orioledb-17 = self' . packages . "psql_orioledb-17/bin" ;
302
302
psql_15 = makeCheckHarness self' . packages . "psql_15/bin" ;
303
303
psql_17 = makeCheckHarness self' . packages . "psql_17/bin" ;
304
304
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" ;
306
306
inherit ( self' . packages )
307
307
wal-g-2
308
308
wal-g-3
Original file line number Diff line number Diff line change 20
20
pkgs . callPackage ../ext/pg_regress.nix { postgresql = postgresqlPackage ; } ;
21
21
pgsqlSuperuser = "supabase_admin" ;
22
22
pkgs-lib = pkgs . callPackage ./lib.nix {
23
- psql_legacy-14 = self' . packages . "psql_legacy-14 /bin" ;
23
+ psql_14 = self' . packages . "psql_14 /bin" ;
24
24
psql_15 = self' . packages . "psql_15/bin" ;
25
25
psql_17 = self' . packages . "psql_17/bin" ;
26
26
psql_orioledb-17 = self' . packages . "psql_orioledb-17/bin" ;
44
44
run-testinfra = pkgs . callPackage ./run-testinfra.nix { } ;
45
45
show-commands = pkgs . callPackage ./show-commands.nix { } ;
46
46
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" ;
48
48
psql_15 = self' . packages . "psql_15/bin" ;
49
49
psql_17 = self' . packages . "psql_17/bin" ;
50
50
psql_orioledb-17 = self' . packages . "psql_orioledb-17/bin" ;
Original file line number Diff line number Diff line change 1
1
{
2
2
psql_17 ,
3
3
psql_15 ,
4
- psql_legacy-14 ,
4
+ psql_14 ,
5
5
psql_orioledb-17 ,
6
6
defaults ,
7
7
supabase-groonga ,
77
77
SHELL_PATH = "${ pkgs . bash } /bin/bash" ;
78
78
PGSQL_DEFAULT_PORT = "${ defaults . port } " ;
79
79
PGSQL_SUPERUSER = "${ defaults . superuser } " ;
80
- PSQL14_BINDIR = "${ psql_legacy-14 } " ;
80
+ PSQL14_BINDIR = "${ psql_14 } " ;
81
81
PSQL15_BINDIR = "${ psql_15 } " ;
82
82
PSQL17_BINDIR = "${ psql_17 } " ;
83
83
PSQL_CONF_FILE = "${ paths . pgconfigFile } " ;
Original file line number Diff line number Diff line change 165
165
recurseForDerivations = true ;
166
166
} ;
167
167
basePackages = {
168
- psql_legacy-14 = makePostgres "14" ;
168
+ psql_14 = makePostgres "14" ;
169
169
psql_15 = makePostgres "15" ;
170
170
psql_17 = makePostgres "17" ;
171
171
psql_orioledb-17 = makePostgres "orioledb-17" ;
Original file line number Diff line number Diff line change 1
1
{
2
2
runCommand ,
3
- psql_legacy-14 ,
3
+ psql_14 ,
4
4
psql_15 ,
5
5
psql_17 ,
6
6
psql_orioledb-17 ,
@@ -17,7 +17,7 @@ runCommand "start-postgres-client" { } ''
17
17
substitute ${ ../tools/run-client.sh.in } $out/bin/start-postgres-client \
18
18
--subst-var-by 'PGSQL_DEFAULT_PORT' '${ defaults . port } ' \
19
19
--subst-var-by 'PGSQL_SUPERUSER' '${ defaults . superuser } ' \
20
- --subst-var-by 'PSQL14_BINDIR' '${ psql_legacy-14 } ' \
20
+ --subst-var-by 'PSQL14_BINDIR' '${ psql_14 } ' \
21
21
--subst-var-by 'PSQL15_BINDIR' '${ psql_15 } ' \
22
22
--subst-var-by 'PSQL17_BINDIR' '${ psql_17 } ' \
23
23
--subst-var-by 'PSQLORIOLEDB17_BINDIR' '${ psql_orioledb-17 } ' \
You can’t perform that action at this time.
0 commit comments