From ddf16c9c794febbb9d3987aae9d35da81b5c9903 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 17:59:39 +0200 Subject: [PATCH 1/7] postgresqlPackages.pg_squeeze: fix update script and version --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 6527ef920f79..b3c4ddc0c8a6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -9,18 +9,18 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_squeeze"; - version = "${builtins.replaceStrings [ "_" ] [ "." ] ( - lib.strings.removePrefix "REL" finalAttrs.src.rev - )}"; + version = "1.7.0"; src = fetchFromGitHub { owner = "cybertec-postgresql"; repo = "pg_squeeze"; - tag = "REL1_7_0"; + tag = "REL${lib.replaceString "." "_" finalAttrs.version}"; hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; - passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=REL(.*)" ]; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^REL(\\d+)_(\\d+)_(\\d+)$" ]; + }; passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; postgresqlExtraSettings = '' From 65049d4556bc710b4a439f42f1b7bca5152cece5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 17:59:51 +0200 Subject: [PATCH 2/7] postgresqlPackages.plr: fix update script and version --- pkgs/servers/sql/postgresql/ext/plr.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index 6f2d9d9d10ea..ae3f7ecaaf20 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -2,6 +2,7 @@ buildEnv, fetchFromGitHub, lib, + nix-update-script, pkg-config, postgresql, postgresqlBuildExtension, @@ -12,14 +13,12 @@ postgresqlBuildExtension (finalAttrs: { pname = "plr"; - version = "${builtins.replaceStrings [ "_" ] [ "." ] ( - lib.strings.removePrefix "REL" finalAttrs.src.rev - )}"; + version = "8.4.7"; src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; - tag = "REL8_4_7"; + tag = "REL${lib.replaceString "." "_" finalAttrs.version}"; hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; }; @@ -29,6 +28,9 @@ postgresqlBuildExtension (finalAttrs: { makeFlags = [ "USE_PGXS=1" ]; passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^REL(\\d+)_(\\d+)_(\\d+)$" ]; + }; withPackages = f: let From 67a79abc4552e5f608c2615db21fbff71a34cd57 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 18:00:02 +0200 Subject: [PATCH 3/7] postgresqlPackages.wal2json: fix update script and version --- pkgs/servers/sql/postgresql/ext/wal2json.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 1427ebc54ec1..44a54bf17a9e 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, lib, + nix-update-script, nixosTests, postgresql, postgresqlBuildExtension, @@ -8,19 +9,20 @@ postgresqlBuildExtension (finalAttrs: { pname = "wal2json"; - version = "${builtins.replaceStrings [ "_" ] [ "." ] ( - lib.strings.removePrefix "wal2json_" finalAttrs.src.rev - )}"; + version = "2.6"; src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; - tag = "wal2json_2_6"; + tag = "wal2json_${lib.replaceString "." "_" finalAttrs.version}"; hash = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; makeFlags = [ "USE_PGXS=1" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^wal2json_(\\d+)_(\\d+)$" ]; + }; passthru.tests = nixosTests.postgresql.wal2json.passthru.override postgresql; meta = { From 8b183cf9aa1c877c35d5cda4fc6c7ce4abb66d6b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 19:54:57 +0200 Subject: [PATCH 4/7] psqlodbc: refactor --- pkgs/by-name/ps/psqlodbc/package.nix | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 526b5e9874fe..c51a8eea0790 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -1,13 +1,15 @@ { - lib, - stdenv, - fetchFromGitHub, - nix-update-script, autoreconfHook, + fetchFromGitHub, + lib, libpq, + nix-update-script, openssl, + stdenv, + withLibiodbc ? false, libiodbc, + withUnixODBC ? true, unixODBC, }: @@ -38,6 +40,13 @@ stdenv.mkDerivation rec { strictDeps = true; + configureFlags = [ + "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross + "--with-libpq=${lib.getDev libpq}" + ] + ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}" + ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}"; + passthru = { updateScript = nix-update-script { }; } @@ -46,18 +55,11 @@ stdenv.mkDerivation rec { driver = "lib/psqlodbcw.so"; }; - configureFlags = [ - "CPPFLAGS=-DSQLCOLATTRIBUTE_SQLLEN" # needed for cross - "--with-libpq=${lib.getDev libpq}" - ] - ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}" - ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}"; - - meta = with lib; { + meta = { homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; - license = licenses.lgpl2; - platforms = platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; teams = libpq.meta.teams; }; } From ca232376ae70986f436dbab248300a8fb10d74f2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 19:51:42 +0200 Subject: [PATCH 5/7] psqlodbc: fix update script --- pkgs/by-name/ps/psqlodbc/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index c51a8eea0790..09543fac64c1 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -16,14 +16,14 @@ assert lib.xor withLibiodbc withUnixODBC; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "psqlodbc"; - version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL-" src.tag)}"; + version = "17.00.0006"; src = fetchFromGitHub { owner = "postgresql-interfaces"; repo = "psqlodbc"; - tag = "REL-17_00_0006"; + tag = "REL-${lib.replaceString "." "_" finalAttrs.version}"; hash = "sha256-iu1PWkfOyWtMmy7/8W+acu8v+e8nUPkCIHtVNZ8HzRg="; }; @@ -48,7 +48,9 @@ stdenv.mkDerivation rec { ++ lib.optional withUnixODBC "--with-unixodbc=${unixODBC}"; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^REL-(\\d+)_(\\d+)_(\\d+)$" ]; + }; } // lib.optionalAttrs withUnixODBC { fancyName = "PostgreSQL"; @@ -62,4 +64,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; teams = libpq.meta.teams; }; -} +}) From 3951f3b158246f22e924b1b0f6f62dbba000e247 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 8 Aug 2025 09:29:23 +0200 Subject: [PATCH 6/7] postgresqlPackages.pg_squeeze: 1.7.0 -> 1.9.0 Release notes: https://github.com/cybertec-postgresql/pg_squeeze/releases/tag/REL1_8_0 https://github.com/cybertec-postgresql/pg_squeeze/releases/tag/REL1_9_0 --- pkgs/servers/sql/postgresql/ext/pg_squeeze.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index b3c4ddc0c8a6..c05a00168bdf 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -9,13 +9,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pg_squeeze"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cybertec-postgresql"; repo = "pg_squeeze"; tag = "REL${lib.replaceString "." "_" finalAttrs.version}"; - hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; + hash = "sha256-RrG7qeX0NQ4cq6N+9uVfalNW+HfiSt4wcjeZjInnfgE="; }; passthru.updateScript = nix-update-script { From adaab0a3f9a3e2fe71e8b47c44128b9b43786459 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 8 Aug 2025 09:52:27 +0200 Subject: [PATCH 7/7] postgresqlPackages.plr: 8.4.7 -> 8.4.8 Changelog: https://github.com/postgres-plr/plr/blob/master/changelog.md#848---2025-05-17 --- pkgs/servers/sql/postgresql/ext/plr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index ae3f7ecaaf20..731bb75cc7d6 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "plr"; - version = "8.4.7"; + version = "8.4.8"; src = fetchFromGitHub { owner = "postgres-plr"; repo = "plr"; tag = "REL${lib.replaceString "." "_" finalAttrs.version}"; - hash = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk="; + hash = "sha256-FLL61HsZ6WaWBP9NqrJjhMFSVyVBIpVO0wv+kXMuAaU="; }; nativeBuildInputs = [ pkg-config ];