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 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" ;
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
Original file line number Diff line number Diff line change 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" ;
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" ;
Original file line number Diff line number Diff line change 11{
22 psql_17 ,
33 psql_15 ,
4- psql_legacy-14 ,
4+ psql_14 ,
55 psql_orioledb-17 ,
66 defaults ,
77 supabase-groonga ,
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 } " ;
Original file line number Diff line number Diff line change 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" ;
Original file line number Diff line number Diff line change 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 } ' \
You can’t perform that action at this time.
0 commit comments