From 95077128f7623875d98d2259459bfe710fdcc62b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 Jan 2025 02:56:37 +0100 Subject: [PATCH] taler-merchant: 0.13.0 -> 0.14.1 --- pkgs/by-name/ta/taler-merchant/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 75f0356f6a0e..2cf1f7de6cf5 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-merchant"; - version = "0.13.0"; + version = "0.14.1"; src = fetchgit { url = "https://git.taler.net/merchant.git"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-N3atOOE21OEks3G1LPOM5qo/kq0D5D9gmTfURCBZx6M="; + hash = "sha256-ac7ajHBLW6BJrL0iaa+b7XNZHMEEmbAo17URIdPSXd8="; }; postUnpack = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { # path to the `taler-exchange` package is used. postPatch = '' substituteInPlace src/backend/taler-merchant-httpd.c \ - --replace-fail 'TALER_TEMPLATING_init ("merchant");' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\");" + --replace-fail 'TALER_TEMPLATING_init (TALER_MERCHANT_project_data ())' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\")" substituteInPlace src/backend/taler-merchant-httpd_spa.c \ --replace-fail 'GNUNET_DISK_directory_scan (dn,' "GNUNET_DISK_directory_scan (\"$out/share/taler/merchant/spa/\"," @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { # NOTE: The executables that need database access fail to detect the # postgresql library in `$out/lib/taler`, so we need to wrap them. postInstall = '' - for exec in dbinit httpd webhook wirewatch depositcheck exchange; do + for exec in dbinit httpd webhook wirewatch depositcheck exchangekeyupdate; do wrapProgram $out/bin/taler-merchant-$exec \ --prefix LD_LIBRARY_PATH : "$out/lib/taler" done