From 07e645793b7dd609baa1672c17891f549134cddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Ferech?= <matus.ferech@gmail.com>
Date: Fri, 29 Dec 2023 02:59:30 +0100
Subject: [PATCH] try symlinking newer gana

---
 pkgs/by-name/challenger/package.nix | 79 ++++++++++-------------------
 pkgs/by-name/challenger/taler.nix   | 20 ++------
 2 files changed, 29 insertions(+), 70 deletions(-)

diff --git a/pkgs/by-name/challenger/package.nix b/pkgs/by-name/challenger/package.nix
index b10270f36..f5b627f5e 100644
--- a/pkgs/by-name/challenger/package.nix
+++ b/pkgs/by-name/challenger/package.nix
@@ -11,65 +11,38 @@
   libmicrohttpd,
   pkg-config,
   postgresql,
-  # taler-exchange,
-  # taler-merchant,
+  taler-exchange,
+  taler-merchant,
   libsodium,
   callPackage,
 }: let
   version = "0.9.3";
-  taler = callPackage ./taler.nix {};
-in
-  stdenv.mkDerivation rec {
-    name = "challenger";
-    inherit version;
-
+  gana = fetchgit {
+    url = "https://git.gnunet.org/gana.git";
+    rev = "c6caa0a91e01b0c74fd71fce71ee5207264a492c";
+    sha256 = "sha256-Y/xDgrBRhlyRe2nbQ7FJEgYk2vg7TAdLwyefnAlM8cg=";
+  };
+
+  prebuilt = fetchgit {
+    url = "https://git.taler.net/docs.git";
+    rev = "5e47a72e8a2b5086dfdae4078f695155f5ed7af8";
+    sha256 = "sha256-e5g2Hwasnezdp67j/vy2ij54D5l0V6M08ONKYvPG/Xk=";
+  };
+
+  te = taler-exchange.overrideAttrs (old: {
     src = fetchgit {
-      url = "https://git.taler.net/challenger.git";
+      url = "https://git.taler.net/exchange.git";
       rev = "v${version}";
-      hash = "sha256-nEEQbU/WogRhciIaIROSxFXtq0q99AifV3XOPQdZZTw=";
+      sha256 = "sha256-P6YLK/eh5h4a4LV/wTNl1mCwFDBicKlypVceLIvVJgc=";
+      fetchSubmodules = false;
     };
 
-    # Taken from ./bootstrap
-    autoreconfPhase = ''
-      cd contrib
-      rm -f Makefile.am
-      find wallet-core/challenger/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext
-      # Remove extra '\' at the end of the file
-      truncate -s -2 Makefile.am.ext
-      cat Makefile.am.in Makefile.am.ext >> Makefile.am
-      # Prevent accidental editing of the generated Makefile.am
-      chmod -w Makefile.am
-      cd ..
-
-
-      echo "$0: Running autoreconf"
-      autoreconf -if
-
+    postUnpack = ''
+      # ln -sn ${gana}/* $sourceRoot/contrib/gana
+      # ln -sn ${prebuilt}/* $sourceRoot/doc/prebuilt
+      cp -r ${gana}/* $sourceRoot/contrib/gana
+      cp -r ${prebuilt}/* $sourceRoot/doc/prebuilt
     '';
-
-    nativeBuildInputs = [
-      pkg-config
-      autoreconfHook
-    ];
-
-    buildInputs = [
-      taler.taler-exchange
-      taler.taler-merchant
-      gnunet
-
-      libmicrohttpd
-      postgresql
-
-      libgcrypt
-      jansson
-      libgnurl
-      curlWithGnuTls
-      libsodium
-    ];
-
-    meta = {
-      homepage = "https://git.taler.net/challenger.git";
-      description = "OAuth 2.0-based authentication service that validates user can receive messages at a certain address.";
-      license = lib.licenses.agpl3Plus;
-    };
-  }
+  });
+in
+  te
diff --git a/pkgs/by-name/challenger/taler.nix b/pkgs/by-name/challenger/taler.nix
index 03e0060c2..c7058078a 100644
--- a/pkgs/by-name/challenger/taler.nix
+++ b/pkgs/by-name/challenger/taler.nix
@@ -21,7 +21,7 @@
   gettext,
   texinfo,
 }: let
-  version = "0.9.3a";
+  version = "0.9.3";
 
   taler-wallet-core = fetchgit {
     url = "https://git.taler.net/wallet-core.git";
@@ -37,7 +37,7 @@
       url = "https://git.taler.net/exchange.git";
       rev = "v${version}";
       fetchSubmodules = true;
-      sha256 = "sha256-yd67vky8xXPFF0wws5CdKpGD7FyqZFYODD2zwQTxYRk=";
+      sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs=";
 
       # When fetching submodules without the .git folder we get the following error:
       # "Server does not allow request for unadvertised object"
@@ -72,19 +72,6 @@
       ./contrib/gana-generate.sh
     '';
 
-    autoreconfPhase = ''
-      cd contrib
-      rm -f Makefile.am
-      find wallet-core/aml-backoffice/ -type f -printf '  %p \\\n' | sort > Makefile.am.ext
-      # Remove extra '\' at the end of the file
-      truncate -s -2 Makefile.am.ext
-      cat Makefile.am.in Makefile.am.ext >> Makefile.am
-      # Prevent accidental editing of the generated Makefile.am
-      chmod -w Makefile.am
-      cd ..
-      autoreconf -fi
-    '';
-
     enableParallelBuilding = true;
 
     nativeCheckInputs = [wget curl];
@@ -117,7 +104,7 @@
       url = "https://git.taler.net/merchant.git";
       rev = "v${version}";
       fetchSubmodules = true;
-      sha256 = "";
+      sha256 = "sha256-HewCqyO/7nnIQY9Tgva0k1nTk2LuwLyGK/UUxvx9BG0=";
     };
     postUnpack = ''
       ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
@@ -151,7 +138,6 @@
 
     nativeCheckInputs = [jq];
     doInstallCheck = true;
-
     checkTarget = "check";
 
     meta = with lib; {