|
27 | 27 | # The 'oriole_pkgs' variable holds all the upstream packages in nixpkgs, which
|
28 | 28 | # we can use to build our own images; it is the common name to refer to
|
29 | 29 | # a copy of nixpkgs which contains all its packages.
|
30 |
| - # it also serves as a base for importing the orioldb/postgres overlay to |
| 30 | + # it also serves as a base for importing the orioldb/postgres overlay to |
31 | 31 | #build the orioledb postgres patched version of postgresql16
|
32 | 32 | oriole_pkgs = import nixpkgs {
|
33 | 33 | config = { allowUnfree = true; };
|
|
302 | 302 | '';
|
303 | 303 |
|
304 | 304 | # Start a version of the client and runs migrations script on server.
|
305 |
| - start-client-and-migrate = |
| 305 | + start-client-and-migrate = |
306 | 306 | let
|
307 | 307 | migrationsDir = ./migrations/db;
|
308 | 308 | postgresqlSchemaSql = ./nix/tools/postgresql_schema.sql;
|
|
346 | 346 | mkdir -p $out/bin
|
347 | 347 | substitute ${./nix/tools/run-replica.sh.in} $out/bin/start-postgres-replica \
|
348 | 348 | --subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
|
349 |
| - --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'\ |
| 349 | + --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' |
350 | 350 | chmod +x $out/bin/start-postgres-replica
|
351 | 351 | '';
|
352 | 352 | sync-exts-versions = pkgs.runCommand "sync-exts-versions" { } ''
|
|
356 | 356 | --subst-var-by 'JQ' '${pkgs.jq}/bin/jq' \
|
357 | 357 | --subst-var-by 'NIX_EDITOR' '${nix-editor.packages.${system}.nix-editor}/bin/nix-editor' \
|
358 | 358 | --subst-var-by 'NIXPREFETCHURL' '${pkgs.nixVersions.nix_2_20}/bin/nix-prefetch-url' \
|
359 |
| - --subst-var-by 'NIX' '${pkgs.nixVersions.nix_2_20}/bin/nix' |
| 359 | + --subst-var-by 'NIX' '${pkgs.nixVersions.nix_2_20}/bin/nix' |
360 | 360 | chmod +x $out/bin/sync-exts-versions
|
361 | 361 | '';
|
362 | 362 | };
|
|
392 | 392 | # Create a simple script to echo the key
|
393 | 393 | echo '#!/bin/sh' > $TMPDIR/getkey.sh
|
394 | 394 | echo 'echo $PGSODIUM_KEY' >> $TMPDIR/getkey.sh
|
395 |
| - chmod +x $TMPDIR/getkey.sh |
| 395 | + chmod +x $TMPDIR/getkey.sh |
396 | 396 | initdb --locale=C
|
397 | 397 | substitute ${./nix/tests/postgresql.conf.in} $PGDATA/postgresql.conf \
|
398 | 398 | --subst-var-by PGSODIUM_GETKEY_SCRIPT "$TMPDIR/getkey.sh"
|
|
430 | 430 | --host=localhost \
|
431 | 431 | --port=5432 \
|
432 | 432 | $(ls ${./nix/tests/sql} | sed -e 's/\..*$//' | sort )
|
433 |
| - |
| 433 | +
|
434 | 434 | pg_ctl -D "$PGDATA" stop
|
435 | 435 | mv $TMPDIR/logfile/postgresql.log $out
|
436 | 436 | echo ${pgpkg}
|
|
0 commit comments