From ca232376ae70986f436dbab248300a8fb10d74f2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 3 Jul 2025 19:51:42 +0200 Subject: [PATCH] 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; }; -} +})