Skip to content

Commit 0a47f15

Browse files
samrosesamrose
authored
fix: include switch script for all multiversion (#2102)
* fix: include switch script for all multiversion * fix: switch-ext on wrappers * fix: switch-ext-http * fix: postgis switch-ext script * fix: wal2json * chore: bump to release * chore: go back to suffix for more testing * chore: bump to release
1 parent b2b53fc commit 0a47f15

22 files changed

Lines changed: 172 additions & 8 deletions

‎ansible/vars.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.062-orioledb"
14-
postgres17: "17.6.1.105"
15-
postgres15: "15.14.1.105"
13+
postgresorioledb-17: "17.6.0.063-orioledb"
14+
postgres17: "17.6.1.106"
15+
postgres15: "15.14.1.106"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.25.1

‎nix/ext/hypopg.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
buildEnv,
55
fetchFromGitHub,
66
postgresql,
7+
makeWrapper,
8+
switch-ext-version,
79
latestOnly ? false,
810
}:
911

@@ -78,6 +80,7 @@ in
7880
buildEnv {
7981
name = pname;
8082
paths = packages;
83+
nativeBuildInputs = [ makeWrapper ];
8184
pathsToLink = [
8285
"/lib"
8386
"/share/postgresql/extension"
@@ -89,6 +92,9 @@ buildEnv {
8992
toString (numberOfVersionsBuilt + 1)
9093
}"
9194
)
95+
96+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
97+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
9298
'';
9399

94100
passthru = {

‎nix/ext/pg-safeupdate.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
fetchFromGitHub,
66
postgresql,
77
makeWrapper,
8+
switch-ext-version,
89
latestOnly ? false,
910
}:
1011

@@ -76,6 +77,9 @@ pkgs.buildEnv {
7677
toString (numberOfVersionsBuilt + 1)
7778
}"
7879
)
80+
81+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
82+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
7983
'';
8084

8185
passthru = {

‎nix/ext/pg_graphql/default.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
postgresql,
88
rust-bin,
99
rsync,
10+
makeWrapper,
11+
switch-ext-version,
1012
latestOnly ? false,
1113
}:
1214

@@ -139,6 +141,7 @@ in
139141
(buildEnv {
140142
name = pname;
141143
paths = packages;
144+
nativeBuildInputs = [ makeWrapper ];
142145
pathsToLink = [
143146
"/lib"
144147
"/share/postgresql/extension"
@@ -177,6 +180,9 @@ in
177180
toString (numberOfVersionsBuilt + 1)
178181
}"
179182
)
183+
184+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
185+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
180186
'';
181187
passthru = {
182188
versions = versionsBuilt;

‎nix/ext/pg_hashids.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
fetchFromGitHub,
55
postgresql,
66
buildEnv,
7+
makeWrapper,
8+
switch-ext-version,
79
latestOnly ? false,
810
}:
911
let
@@ -86,6 +88,7 @@ in
8688
buildEnv {
8789
name = pname;
8890
paths = packages;
91+
nativeBuildInputs = [ makeWrapper ];
8992
pathsToLink = [
9093
"/lib"
9194
"/share/postgresql/extension"
@@ -97,6 +100,9 @@ buildEnv {
97100
toString (numberOfVersionsBuilt + 1)
98101
}"
99102
)
103+
104+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
105+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
100106
'';
101107

102108
passthru = {

‎nix/ext/pg_jsonschema/default.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
fetchFromGitHub,
77
postgresql,
88
rust-bin,
9+
makeWrapper,
10+
switch-ext-version,
911
latestOnly ? false,
1012
}:
1113
let
@@ -146,6 +148,7 @@ in
146148
(pkgs.buildEnv {
147149
name = pname;
148150
paths = packages;
151+
nativeBuildInputs = [ makeWrapper ];
149152
pathsToLink = [
150153
"/lib"
151154
"/share/postgresql/extension"
@@ -175,6 +178,9 @@ in
175178
}
176179
177180
create_sql_files
181+
182+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
183+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
178184
'';
179185

180186
passthru = {

‎nix/ext/pg_plan_filter.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
fetchFromGitHub,
66
postgresql,
77
makeWrapper,
8+
switch-ext-version,
89
latestOnly ? false,
910
}:
1011

@@ -79,6 +80,9 @@ pkgs.buildEnv {
7980
toString (numberOfVersionsBuilt + 1)
8081
}"
8182
)
83+
84+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
85+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
8286
'';
8387

8488
passthru = {

‎nix/ext/pg_repack.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
postgresqlTestHook,
77
testers,
88
buildEnv,
9+
makeWrapper,
10+
switch-ext-version,
911
latestOnly ? false,
1012
}:
1113
let
@@ -113,6 +115,7 @@ in
113115
buildEnv {
114116
name = pname;
115117
paths = packages;
118+
nativeBuildInputs = [ makeWrapper ];
116119

117120
pathsToLink = [
118121
"/bin"
@@ -131,6 +134,9 @@ buildEnv {
131134
ls -la $out/lib/*${postgresql.dlSuffix} || true
132135
exit 1
133136
fi
137+
138+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
139+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
134140
'';
135141

136142
passthru = {

‎nix/ext/pg_stat_monitor.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
fetchFromGitHub,
55
postgresql,
66
buildEnv,
7+
makeWrapper,
8+
switch-ext-version,
79
latestOnly ? false,
810
}:
911
let
@@ -84,6 +86,7 @@ in
8486
buildEnv {
8587
name = pname;
8688
paths = packages;
89+
nativeBuildInputs = [ makeWrapper ];
8790

8891
pathsToLink = [
8992
"/lib"
@@ -101,6 +104,9 @@ buildEnv {
101104
ls -la $out/lib/*${postgresql.dlSuffix} || true
102105
exit 1
103106
fi
107+
108+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
109+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
104110
'';
105111

106112
passthru = {

‎nix/ext/pg_tle.nix‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
flex,
88
openssl,
99
libkrb5,
10+
makeWrapper,
11+
switch-ext-version,
1012
latestOnly ? false,
1113
}:
1214
let
@@ -91,6 +93,7 @@ in
9193
buildEnv {
9294
name = pname;
9395
paths = packages;
96+
nativeBuildInputs = [ makeWrapper ];
9497
pathsToLink = [
9598
"/lib"
9699
"/share/postgresql/extension"
@@ -102,6 +105,9 @@ buildEnv {
102105
toString (numberOfVersionsBuilt + 1)
103106
}"
104107
)
108+
109+
makeWrapper ${lib.getExe switch-ext-version} $out/bin/switch_${pname}_version \
110+
--prefix EXT_WRAPPER : "$out" --prefix EXT_NAME : "${pname}"
105111
'';
106112

107113
passthru = {

0 commit comments

Comments
 (0)