parent
caa041c44b
commit
0e1ad6217a
@ -0,0 +1,57 @@ |
||||
{ lib, stdenv, fetchurl, curl, gnunet, jansson, libgcrypt, libmicrohttpd |
||||
, qrencode, libsodium, libtool, pkg-config, postgresql, sqlite }: |
||||
|
||||
let |
||||
gnunet' = gnunet.override { postgresqlSupport = true; }; |
||||
|
||||
mkTaler = { pname, version, sha256 }: |
||||
extraAttrs: |
||||
stdenv.mkDerivation (extraAttrs // { |
||||
inherit pname version; |
||||
src = fetchurl { |
||||
url = "mirror://gnu/taler/${pname}-${version}.tar.gz"; |
||||
inherit sha256; |
||||
}; |
||||
enableParallelBuilding = true; |
||||
meta = with lib; { |
||||
description = "Anonymous, taxable payment system."; |
||||
homepage = "https://taler.net/"; |
||||
license = licenses.agpl3Plus; |
||||
maintainers = with maintainers; [ ehmry ]; |
||||
platforms = platforms.gnu ++ platforms.linux; |
||||
}; |
||||
}); |
||||
|
||||
in rec { |
||||
|
||||
taler-exchange = mkTaler { |
||||
pname = "taler-exchange"; |
||||
version = "0.8.1"; |
||||
sha256 = "sha256-MPt3n1JXd0Y89b1qCuF6YxptSr7henfYp97JTq1Z+x4="; |
||||
} { |
||||
buildInputs = [ |
||||
curl |
||||
jansson |
||||
libgcrypt |
||||
libmicrohttpd |
||||
libsodium |
||||
libtool |
||||
postgresql |
||||
# sqlite |
||||
]; |
||||
propagatedBuildInputs = [ gnunet' ]; |
||||
patches = [ ./exchange-fix-6665.patch ]; |
||||
}; |
||||
|
||||
taler-merchant = mkTaler { |
||||
pname = "taler-merchant"; |
||||
version = "0.8.0"; |
||||
sha256 = "sha256-scrFLXeoQirGqhc+bSQKRl84PfUvjrp1uxF7pfOIB9Q="; |
||||
} { |
||||
nativeBuildInputs = [ pkg-config ]; |
||||
buildInputs = taler-exchange.buildInputs ++ [ qrencode taler-exchange ]; |
||||
propagatedBuildInputs = [ gnunet' ]; |
||||
PKG_CONFIG = "${pkg-config}/bin/pkg-config"; |
||||
}; |
||||
|
||||
} |
@ -0,0 +1,48 @@ |
||||
commit 9911b327ac299ec7eeae81b98cb520f4153071f2
|
||||
Author: Christian Grothoff <christian@grothoff.org>
|
||||
Date: Wed Dec 9 07:25:26 2020 +0100
|
||||
|
||||
fix #6665
|
||||
|
||||
diff --git a/src/testing/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c
|
||||
index e1b17fa9..979607cd 100644
|
||||
--- a/src/testing/testing_api_cmd_rewind.c
|
||||
+++ b/src/testing/testing_api_cmd_rewind.c
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
#include "platform.h"
|
||||
#include "taler_exchange_service.h"
|
||||
-#include "taler/taler_testing_lib.h"
|
||||
#include "taler_testing_lib.h"
|
||||
|
||||
|
||||
diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
index 2cb92a8f..b3903f29 100644
|
||||
--- a/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
+++ b/src/testing/testing_api_cmd_twister_exec_client.c
|
||||
@@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include "platform.h"
|
||||
-#include <taler/taler_testing_lib.h>
|
||||
+#include "taler_testing_lib.h"
|
||||
#include "taler_twister_testing_lib.h"
|
||||
|
||||
|
||||
diff --git a/src/testing/testing_api_trait_uuid.c b/src/testing/testing_api_trait_uuid.c
|
||||
index c9b73a5b..4d5003ec 100644
|
||||
--- a/src/testing/testing_api_trait_uuid.c
|
||||
+++ b/src/testing/testing_api_trait_uuid.c
|
||||
@@ -22,9 +22,9 @@
|
||||
* @author Jonathan Buchanan
|
||||
*/
|
||||
#include "platform.h"
|
||||
-#include <taler/taler_signatures.h>
|
||||
-#include <taler/taler_exchange_service.h>
|
||||
-#include <taler/taler_testing_lib.h>
|
||||
+#include "taler_signatures.h"
|
||||
+#include "taler_exchange_service.h"
|
||||
+#include "taler_testing_lib.h"
|
||||
|
||||
|
||||
#define TALER_TESTING_TRAIT_UUID "uuid"
|
Loading…
Reference in new issue