Skip to content

fix: include switch script for all multiversion #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
samrose wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

fix: include switch script for all multiversion #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec432b4
fix: include switch script for all multiversion
samrose Apr 3, 2026
57f6c8f
fix: switch-ext on wrappers
samrose Apr 3, 2026
319ea5c
fix: switch-ext-http
samrose Apr 3, 2026
4b9760b
fix: postgis switch-ext script
samrose Apr 3, 2026
249bc18
fix: wal2json
samrose Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.6.0.061-orioledb"
postgres17: "17.6.1.104"
postgres15: "15.14.1.104"
postgresorioledb-17: "17.6.0.061-orioledb-switch-1"
postgres17: "17.6.1.104-switch-1"
postgres15: "15.14.1.104-switch-1"

# Non Postgres Extensions
pgbouncer_release: 1.25.1
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/hypopg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
buildEnv,
fetchFromGitHub,
postgresql,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:

Expand Down Expand Up @@ -78,6 +80,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand All @@ -89,6 +92,9 @@ buildEnv {
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
4 changes: 4 additions & 0 deletions nix/ext/pg-safeupdate.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
fetchFromGitHub,
postgresql,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:

Expand Down Expand Up @@ -76,6 +77,9 @@ pkgs.buildEnv {
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_graphql/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
postgresql,
rust-bin,
rsync,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:

Expand Down Expand Up @@ -139,6 +141,7 @@ in
(buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand Down Expand Up @@ -177,6 +180,9 @@ in
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';
passthru = {
versions = versionsBuilt;
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_hashids.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
fetchFromGitHub,
postgresql,
buildEnv,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -86,6 +88,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand All @@ -97,6 +100,9 @@ buildEnv {
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_jsonschema/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
fetchFromGitHub,
postgresql,
rust-bin,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -146,6 +148,7 @@ in
(pkgs.buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand Down Expand Up @@ -175,6 +178,9 @@ in
}

create_sql_files

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
4 changes: 4 additions & 0 deletions nix/ext/pg_plan_filter.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
fetchFromGitHub,
postgresql,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:

Expand Down Expand Up @@ -79,6 +80,9 @@ pkgs.buildEnv {
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_repack.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
postgresqlTestHook,
testers,
buildEnv,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -113,6 +115,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];

pathsToLink = [
"/bin"
Expand All @@ -131,6 +134,9 @@ buildEnv {
ls -la $out/lib/*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_stat_monitor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
fetchFromGitHub,
postgresql,
buildEnv,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -84,6 +86,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];

pathsToLink = [
"/lib"
Expand All @@ -101,6 +104,9 @@ buildEnv {
ls -la $out/lib/*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pg_tle.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
flex,
openssl,
libkrb5,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -91,6 +93,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand All @@ -102,6 +105,9 @@ buildEnv {
toString (numberOfVersionsBuilt + 1)
}"
)

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pgaudit.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
libkrb5,
openssl,
postgresql,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
#adapted from https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/sql/postgresql/ext/pgaudit.nix
Expand Down Expand Up @@ -138,6 +140,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand Down Expand Up @@ -231,6 +234,9 @@ buildEnv {
ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
5 changes: 5 additions & 0 deletions nix/ext/pgroonga/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
buildEnv,
supabase-groonga,
mecab-naist-jdic,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -157,6 +158,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];

pathsToLink = [
"/lib"
Expand All @@ -173,6 +175,9 @@ buildEnv {
ls -la $out/lib/*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pgrouting/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
cmake,
boost,
buildEnv,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -127,6 +129,7 @@ in
buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];

pathsToLink = [
"/lib"
Expand All @@ -144,6 +147,9 @@ buildEnv {
ls -la $out/lib/*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
6 changes: 6 additions & 0 deletions nix/ext/pgsodium.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
fetchFromGitHub,
postgresql,
libsodium,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -87,6 +89,7 @@ in
pkgs.buildEnv {
name = pname;
paths = packages;
nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand All @@ -103,6 +106,9 @@ pkgs.buildEnv {
ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
13 changes: 9 additions & 4 deletions nix/ext/pgsql-http.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
fetchFromGitHub,
postgresql,
curl,
makeWrapper,
switch-ext-version,
latestOnly ? false,
}:
let
Expand Down Expand Up @@ -55,8 +57,8 @@ let

mkdir -p $out/{lib,share/postgresql/extension}

# Install versioned library
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${fileVersion}${postgresql.dlSuffix}
# Install versioned library (single dash for switch-ext-version compatibility)
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}-${fileVersion}${postgresql.dlSuffix}

cp ${pname}--${fileVersion}.sql $out/share/postgresql/extension/${pname}--${fileVersion}.sql

Expand All @@ -71,7 +73,7 @@ let
echo "default_version = '${fileVersion}'"
cat $out/share/postgresql/extension/${pname}--${fileVersion}.control
} > $out/share/postgresql/extension/${pname}.control
ln -sfn ${pname}--${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
ln -sfn ${pname}-${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
cp *.sql $out/share/postgresql/extension
fi

Expand All @@ -89,7 +91,7 @@ in
pkgs.buildEnv {
name = pname;
paths = packages;

nativeBuildInputs = [ makeWrapper ];
pathsToLink = [
"/lib"
"/share/postgresql/extension"
Expand All @@ -105,6 +107,9 @@ pkgs.buildEnv {
ls -la $out/lib/${pname}*${postgresql.dlSuffix} || true
exit 1
fi

makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
'';

passthru = {
Expand Down
Loading
Loading