diff --git a/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch b/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch index 60ea8051366e..0e31e287ae83 100644 --- a/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch +++ b/pkgs/by-name/ta/taler-exchange/0001-add-TALER_TEMPLATING_init_path.patch @@ -9,14 +9,14 @@ headers, which makes it harder to patch in the correct directory. To circumvent this, a similar function that takes the templates path directly is added. --- - src/include/taler_templating_lib.h | 9 +++++++++ + src/include/taler/taler_templating_lib.h | 9 +++++++++ src/templating/templating_api.c | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) -diff --git a/src/include/taler_templating_lib.h b/src/include/taler_templating_lib.h +diff --git a/src/include/taler/taler_templating_lib.h b/src/include/taler/taler_templating_lib.h index 6af6db715..343004ef1 100644 ---- a/src/include/taler_templating_lib.h -+++ b/src/include/taler_templating_lib.h +--- a/src/include/taler/taler_templating_lib.h ++++ b/src/include/taler/taler_templating_lib.h @@ -120,6 +120,16 @@ TALER_TEMPLATING_reply_error (struct MHD_Connection *connection, enum GNUNET_GenericReturnValue TALER_TEMPLATING_init (const char *subsystem); diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 185af90a718b..2fe055b21bdf 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -16,6 +16,7 @@ recutils, wget, jq, + uncrustify, gettext, texinfo, libtool, @@ -24,17 +25,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "taler-exchange"; - version = "1.0.4"; + version = "1.3.0"; src = fetchgit { url = "https://git.taler.net/exchange.git"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-k2e9pzy7vSIjCVGOVif9ntYvLcvoJA6J63vB/lg3iwA="; + hash = "sha256-FePuJUEa01E2jlAOdHryzkFwXqNcU+AkMKs1pamNJn8="; }; patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ]; + postPatch = '' + substituteInPlace contrib/gana-generate.sh \ + --replace-fail "existence git" "true" \ + --replace-fail "uncrustify.cfg" "contrib/uncrustify.cfg" + ''; + nativeBuildInputs = [ autoreconfHook recutils # recfix @@ -43,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { texinfo # makeinfo # jq is necessary for some tests and is checked by configure script jq + uncrustify ]; buildInputs = [