Skip to content

Commit 8adc8ac

Browse files
committed
modified files to use major and minor version but pull full versions from repo
1 parent 6283679 commit 8adc8ac

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

nix/ext/pgsql-http.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ let
3030
version: hash:
3131
stdenv.mkDerivation rec {
3232
inherit pname version;
33+
34+
# Use major.minor version for filenames (e.g., 1.5 instead of 1.5.0)
35+
fileVersion = lib.versions.majorMinor version;
3336

3437
buildInputs = [
3538
curl
@@ -49,22 +52,22 @@ let
4952
mkdir -p $out/{lib,share/postgresql/extension}
5053
5154
# Install versioned library
52-
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${version}${postgresql.dlSuffix}
55+
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${fileVersion}${postgresql.dlSuffix}
5356
54-
cp ${pname}--${version}.sql $out/share/postgresql/extension/${pname}--${version}.sql
57+
cp ${pname}--${fileVersion}.sql $out/share/postgresql/extension/${pname}--${fileVersion}.sql
5558
5659
# Create versioned control file with modified module path
5760
sed -e "/^default_version =/d" \
5861
-e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \
59-
${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
62+
${pname}.control > $out/share/postgresql/extension/${pname}--${fileVersion}.control
6063
6164
# For the latest version, create default control file and symlink and copy SQL upgrade scripts
6265
if [[ "${version}" == "${latestVersion}" ]]; then
6366
{
64-
echo "default_version = '${version}'"
65-
cat $out/share/postgresql/extension/${pname}--${version}.control
67+
echo "default_version = '${fileVersion}'"
68+
cat $out/share/postgresql/extension/${pname}--${fileVersion}.control
6669
} > $out/share/postgresql/extension/${pname}.control
67-
ln -sfn ${pname}--${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
70+
ln -sfn ${pname}--${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
6871
cp *.sql $out/share/postgresql/extension
6972
fi
7073

nix/ext/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"http": {
3-
"1.5": {
3+
"1.5.0": {
44
"postgresql": [
55
"15"
66
],

0 commit comments

Comments
 (0)