From a8dc209ec3120826a0edf33259a5830f89eae0b7 Mon Sep 17 00:00:00 2001 From: Chris Gwilliams <517923+encima@users.noreply.github.com> Date: Thu, 2 Oct 2025 10:20:30 +0300 Subject: [PATCH 1/6] modified files to use major and minor version but pull full versions from repo --- nix/checks.nix | 2 +- nix/ext/pgsql-http.nix | 14 ++++++++------ nix/ext/versions.json | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nix/checks.nix b/nix/checks.nix index 74b50a84f..538e6158b 100644 --- a/nix/checks.nix +++ b/nix/checks.nix @@ -149,7 +149,7 @@ ) filteredSqlTests; sortedTestList = builtins.sort (a: b: a < b) testList; in - pkgs.runCommand "postgres-${pgpkg.version}-check-harness" + pkgs.runCommand "postgres-${pgpkg.version}-ch" { nativeBuildInputs = with pkgs; [ coreutils diff --git a/nix/ext/pgsql-http.nix b/nix/ext/pgsql-http.nix index 6b9394e55..ba669e22d 100644 --- a/nix/ext/pgsql-http.nix +++ b/nix/ext/pgsql-http.nix @@ -30,6 +30,8 @@ let version: hash: stdenv.mkDerivation rec { inherit pname version; + # Use major.minor version for filenames (e.g., 1.5 instead of 1.5.0) + fileVersion = lib.versions.majorMinor version; buildInputs = [ curl @@ -49,22 +51,22 @@ let mkdir -p $out/{lib,share/postgresql/extension} # Install versioned library - install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${version}${postgresql.dlSuffix} + install -Dm755 ${pname}${postgresql.dlSuffix} $out/lib/${pname}--${fileVersion}${postgresql.dlSuffix} - cp ${pname}--${version}.sql $out/share/postgresql/extension/${pname}--${version}.sql + cp ${pname}--${fileVersion}.sql $out/share/postgresql/extension/${pname}--${fileVersion}.sql # Create versioned control file with modified module path sed -e "/^default_version =/d" \ -e "s|^module_pathname = .*|module_pathname = '\$libdir/${pname}'|" \ - ${pname}.control > $out/share/postgresql/extension/${pname}--${version}.control + ${pname}.control > $out/share/postgresql/extension/${pname}--${fileVersion}.control # For the latest version, create default control file and symlink and copy SQL upgrade scripts if [[ "${version}" == "${latestVersion}" ]]; then { - echo "default_version = '${version}'" - cat $out/share/postgresql/extension/${pname}--${version}.control + echo "default_version = '${fileVersion}'" + cat $out/share/postgresql/extension/${pname}--${fileVersion}.control } > $out/share/postgresql/extension/${pname}.control - ln -sfn ${pname}--${latestVersion}${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 diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 53666e1cd..096ff5367 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -1,6 +1,6 @@ { "http": { - "1.5": { + "1.5.0": { "postgresql": [ "15" ], From 7cf35415488e3515440933206f4d24f4d99771d1 Mon Sep 17 00:00:00 2001 From: Chris Gwilliams <517923+encima@users.noreply.github.com> Date: Thu, 2 Oct 2025 12:03:10 +0300 Subject: [PATCH 2/6] update http tests for major minor versions --- nix/ext/tests/http.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nix/ext/tests/http.nix b/nix/ext/tests/http.nix index 100fdcd00..09075c374 100644 --- a/nix/ext/tests/http.nix +++ b/nix/ext/tests/http.nix @@ -103,11 +103,13 @@ self.inputs.nixpkgs.lib.nixos.runTest { { nodes, ... }: let pg17-configuration = "${nodes.server.system.build.toplevel}/specialisation/postgresql17"; + # Convert versions to major.minor format (e.g., "1.5.0" -> "1.5") + toMajorMinor = map (v: lib.versions.majorMinor v); in '' versions = { - "15": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "15"))}], - "17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "17"))}], + "15": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (toMajorMinor (versions "15")))}], + "17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (toMajorMinor (versions "17")))}], } def run_sql(query): From 19a6766c806eb63f2260a038a2ab4c1994169dfc Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 2 Oct 2025 12:22:04 -0400 Subject: [PATCH 3/6] chore: bump to test --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 42c8cd3b5..ff574fefe 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: 17.5.1.032-orioledb - postgres17: 17.6.1.011 - postgres15: 15.14.1.011 + postgresorioledb-17: 17.5.1.032-orioledb-httpfix-1 + postgres17: 17.6.1.011-httpfix-1 + postgres15: 15.14.1.011-httpfix-1 # Non Postgres Extensions pgbouncer_release: 1.19.0 From 4718cf2f48a48ff26dc323c1f5b721e1815aa399 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 2 Oct 2025 14:18:33 -0400 Subject: [PATCH 4/6] chore: bump version to release --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index ff574fefe..6e3170cf3 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: 17.5.1.032-orioledb-httpfix-1 - postgres17: 17.6.1.011-httpfix-1 - postgres15: 15.14.1.011-httpfix-1 + postgresorioledb-17: 17.5.1.033-orioledb + postgres17: 17.6.1.012 + postgres15: 15.14.1.012 # Non Postgres Extensions pgbouncer_release: 1.19.0 From 1a3a4320f10b6f349372ee793ea59fdea4713ced Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 2 Oct 2025 15:35:42 -0400 Subject: [PATCH 5/6] fix: replace lost text in name of checkharness --- nix/checks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/checks.nix b/nix/checks.nix index 538e6158b..74b50a84f 100644 --- a/nix/checks.nix +++ b/nix/checks.nix @@ -149,7 +149,7 @@ ) filteredSqlTests; sortedTestList = builtins.sort (a: b: a < b) testList; in - pkgs.runCommand "postgres-${pgpkg.version}-ch" + pkgs.runCommand "postgres-${pgpkg.version}-check-harness" { nativeBuildInputs = with pkgs; [ coreutils From 99a535f2a799da91a13ee48a2a76d55bd95c8aee Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 2 Oct 2025 15:45:02 -0400 Subject: [PATCH 6/6] chore: also use semver with patch ver in 1.6 version --- nix/ext/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/ext/versions.json b/nix/ext/versions.json index 096ff5367..f786fc3f5 100644 --- a/nix/ext/versions.json +++ b/nix/ext/versions.json @@ -6,7 +6,7 @@ ], "hash": "sha256-+N/CXm4arRgvhglanfvO0FNOBUWV5RL8mn/9FpNvcjY=" }, - "1.6": { + "1.6.1": { "postgresql": [ "15", "17"