Skip to content

Commit a8dc209

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

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

nix/checks.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
) filteredSqlTests;
150150
sortedTestList = builtins.sort (a: b: a < b) testList;
151151
in
152-
pkgs.runCommand "postgres-${pgpkg.version}-check-harness"
152+
pkgs.runCommand "postgres-${pgpkg.version}-ch"
153153
{
154154
nativeBuildInputs = with pkgs; [
155155
coreutils

nix/ext/pgsql-http.nix

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

3436
buildInputs = [
3537
curl
@@ -49,22 +51,22 @@ let
4951
mkdir -p $out/{lib,share/postgresql/extension}
5052
5153
# Install versioned library
52-
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${version}${postgresql.dlSuffix}
54+
install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${fileVersion}${postgresql.dlSuffix}
5355
54-
cp ${pname}--${version}.sql $out/share/postgresql/extension/${pname}--${version}.sql
56+
cp ${pname}--${fileVersion}.sql $out/share/postgresql/extension/${pname}--${fileVersion}.sql
5557
5658
# Create versioned control file with modified module path
5759
sed -e "/^default_version =/d" \
5860
-e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \
59-
${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control
61+
${pname}.control > $out/share/postgresql/extension/${pname}--${fileVersion}.control
6062
6163
# For the latest version, create default control file and symlink and copy SQL upgrade scripts
6264
if [[ "${version}" == "${latestVersion}" ]]; then
6365
{
64-
echo "default_version = '${version}'"
65-
cat $out/share/postgresql/extension/${pname}--${version}.control
66+
echo "default_version = '${fileVersion}'"
67+
cat $out/share/postgresql/extension/${pname}--${fileVersion}.control
6668
} > $out/share/postgresql/extension/${pname}.control
67-
ln -sfn ${pname}--${latestVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
69+
ln -sfn ${pname}--${fileVersion}${postgresql.dlSuffix} $out/lib/${pname}${postgresql.dlSuffix}
6870
cp *.sql $out/share/postgresql/extension
6971
fi
7072

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)