Skip to content

Commit 381035f

Browse files
committed
Revert "fix: control files need module_pathname"
This reverts commit 4996d81. This change would not resolve the issue it was targeting.
1 parent 4996d81 commit 381035f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

ansible/vars.yml

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

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.5.1.018-orioledb-rc-2"
13-
postgres17: "17.4.1.075-rc-2"
14-
postgres15: "15.8.1.132-rc-2"
12+
postgresorioledb-17: "17.5.1.018-orioledb-rc-1"
13+
postgres17: "17.4.1.075-rc-1"
14+
postgres15: "15.8.1.132-rc-1"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"

nix/ext/pg_net.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,10 @@ let
162162
# Install upgrade scripts
163163
find . -name '${pname}--*--*.sql' -exec install -Dm644 {} $out/share/postgresql/extension/ \;
164164
165-
# Create versioned control file with module_pathname
166-
{
167-
sed "/^default_version =/d" ${pname}.control
168-
echo "module_pathname = '\$libdir/${pname}'"
169-
} > $out/share/postgresql/extension/${pname}--${version}.control
165+
# Create versioned control file with modified module path
166+
sed -e "/^default_version =/d" \
167+
-e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \
168+
${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
170169
'';
171170

172171
meta = with lib; {

0 commit comments

Comments
 (0)