gnunet: 0.25.2 -> 0.26.2; taler: 1.0 -> 1.3 (#484551)

doc/release-notes/rl-2605.section.md

@@ -148,6 +148,10 @@
 
 - Switch inhibitors were introduced, which add a pre-switch check that compares a list of strings between the previous and the new generation, and refuses to switch into the new generation when there is a difference between the two lists. This allows to avoid switching into a system when for instance the systemd version changed by adding `config.systemd.package.version` to the switch inhibitors for your system. You can still forcefully switch into any generation by setting `NIXOS_NO_CHECK=1`.
 
+- GNU Taler has been updated to version 1.3.
+  This release focuses on getting everything ready for a deployment of GNU Taler by Magnet bank.
+  For more details, see the [upstream release notes](https://www.taler.net/en/news/2025-13.html).
+
 - The `services.nextcloud-spreed-signaling` NixOS module has been added to facilitate declarative management of a standalone Spreed signaling server ("High Performance Backend" for Nextcloud Talk).
 
 - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.

nixos/modules/services/finance/taler/exchange.nix

@@ -91,7 +91,7 @@ in
       type = lib.types.lines;
       defaultText = "None, you must set this yourself.";
       example = ''
-        [COIN-KUDOS-n1-t1718140083]
+        [COIN_KUDOS-n1-t1718140083]
         VALUE = KUDOS:0.1
         DURATION_WITHDRAW = 7 days
         DURATION_SPEND = 2 years

nixos/tests/taler/conf/taler-denominations.conf

@@ -1,4 +1,4 @@
-[COIN-KUDOS-n1-t1726827661]
+[COIN_KUDOS-n1-t1726827661]
 VALUE = KUDOS:0.1
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -10,7 +10,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n2-t1726827661]
+[COIN_KUDOS-n2-t1726827661]
 VALUE = KUDOS:0.2
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -22,7 +22,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n3-t1726827661]
+[COIN_KUDOS-n3-t1726827661]
 VALUE = KUDOS:0.4
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -34,7 +34,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n4-t1726827661]
+[COIN_KUDOS-n4-t1726827661]
 VALUE = KUDOS:0.8
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -46,7 +46,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n5-t1726827661]
+[COIN_KUDOS-n5-t1726827661]
 VALUE = KUDOS:1.6
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -58,7 +58,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n6-t1726827661]
+[COIN_KUDOS-n6-t1726827661]
 VALUE = KUDOS:3.2
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -70,7 +70,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n7-t1726827661]
+[COIN_KUDOS-n7-t1726827661]
 VALUE = KUDOS:6.4
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years
@@ -82,7 +82,7 @@ FEE_REFUND = KUDOS:0
 RSA_KEYSIZE = 2048
 CIPHER = RSA
 
-[COIN-KUDOS-n8-t1726827661]
+[COIN_KUDOS-n8-t1726827661]
 VALUE = KUDOS:12.8
 DURATION_WITHDRAW = 7 days
 DURATION_SPEND = 2 years

pkgs/by-name/gn/gnunet-gtk/package.nix

@@ -51,5 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = gnunet.meta // {
     description = "GNUnet GTK User Interface";
     homepage = "https://git.gnunet.org/gnunet-gtk.git";
+    # https://www.gnunet.org/en/news/2025-09-0.25.0.html
+    broken = true;
   };
 })

pkgs/by-name/gn/gnunet/package.nix

@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.25.2";
+  version = "0.26.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-6rdvw105OrFfrbY0T4Q1JcFlYZQAc1qm3eCWb2omwuY=";
+    hash = "sha256-d7fjcM2EA39XktgSU2vFoQNUCeajSqBo0Iyegb6Ak4k=";
   };
 
   enableParallelBuilding = true;

pkgs/by-name/li/libeufin/package.nix

@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libeufin";
-  version = "1.0.2";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "https://git.taler.net/libeufin.git/";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZjZo0oCsrnc413OY7ElU95Vto9Smp6fuPI3RzJzC3Zk=";
+    hash = "sha256-bt1NBoiN52CX2Itg8lQ/b0V/MZulBTaD8luNlH4Mwss=";
     fetchSubmodules = true;
     leaveDotGit = true; # required for correct submodule fetching
     # Save the HEAD short commit hash in a file so it can be retrieved later for versioning.
     # Delete .git folder for reproducibility (otherwise, the hash changes unexpectedly after fetching submodules)
     postFetch = ''
       pushd $out
-      git rev-parse HEAD > ./common/src/main/resources/HEAD.txt
+      git rev-parse HEAD > ./libeufin-common/src/main/resources/HEAD.txt
       rm -rf .git
       popd
     '';
@@ -37,9 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
   patchPhase = ''
     runHook prePatch
 
+    substituteInPlace Makefile \
+      --replace-fail "install: build install-nobuild-files" "install: install-nobuild-files"
+
     # The .git folder had to be deleted. Read hash from file instead of using the git command.
     substituteInPlace build.gradle \
-      --replace-fail "commandLine 'git', 'rev-parse', '--short', 'HEAD'" 'commandLine "cat", "$projectDir/common/src/main/resources/HEAD.txt"'
+      --replace-fail "git rev-parse --short HEAD" "cat $projectDir/libeufin-common/src/main/resources/HEAD.txt"
 
     # Use gradle repo to download dependencies
     substituteInPlace build.gradle \
@@ -62,8 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ];
   gradleBuildTask = [
-    "bank:installShadowDist"
-    "nexus:installShadowDist"
+    "libeufin-bank:installShadowDist"
+    "libeufin-nexus:installShadowDist"
+    "libeufin-ebisync:installShadowDist"
   ];
 
   nativeBuildInputs = [
@@ -76,9 +80,9 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    make install-nobuild
+    make install
 
-    for exe in libeufin-nexus libeufin-bank ; do
+    for exe in libeufin-bank libeufin-nexus libeufin-ebisync ; do
       wrapProgram $out/bin/$exe \
         --set JAVA_HOME ${jdk17_headless.home} \
         --prefix PATH : $out/bin \

pkgs/by-name/li/libgnunetchat/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchgit,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -16,14 +17,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgnunetchat";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchgit {
     url = "https://git.gnunet.org/libgnunetchat.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pRO8i7tHynCqm97RLMBOiWKCl2CAYBE6RXfyIljIiQ0=";
+    hash = "sha256-FKFoIuGGPcYVRBrsqn1rnodRVCLAjLKlgZOs9v4H+8w=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://build.opensuse.org/public/source/openSUSE:Factory/libgnunetchat/libgnunetchat-0.6.1-gnunet-0.26.2.patch?rev=6";
+      hash = "sha256-Q0FvZUXSnYwK+LsN9MoW7v+gPYmD7w4E+bXNDluhxfI=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [

pkgs/by-name/ta/taler-challenger/package.nix

@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-challenger";
-  version = "1.0.0";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "https://git.taler.net/challenger.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZKRqNlva3LZCuAva7h6Wk2NIuHF3rReR+yNETqbCv1k=";
+    hash = "sha256-oomrqpA/V2sNTRzFbHS7rnZdTIs8w+SRYsa9AYDFn5o=";
   };
 
   # https://git.taler.net/challenger.git/tree/bootstrap

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);

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 = [

pkgs/by-name/ta/taler-mdb/package.nix

@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-mdb";
-  version = "1.0.0";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "https://git.taler.net/taler-mdb.git";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-AAFnF8bN2Pnhy8OZbgA6CRHBIC6iP785HpVjPEVu+IQ=";
+    hash = "sha256-bslsC/m75kt8JoIQPp53u64SxghwZloOHehctphpNwI=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ta/taler-merchant/package.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-merchant";
-  version = "1.0.1";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "https://git.taler.net/merchant.git";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-H/JqMGLP0u68g/bMqsollAk6sKL73TCZ9no49psYST0=";
+    hash = "sha256-nrXokwZ0IFXAH3B12/FDAhhyE6JAiiJ59cuWLwLM684=";
   };
 
   postUnpack = ''
@@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
       --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/\","
+      --replace-fail 'TALER_MHD_spa_load (TALER_MERCHANT_project_data (),' "TALER_MHD_spa_load_dir (\"$out/share/taler/merchant/spa/\");" \
+      --replace-fail '"spa/");' ""
   '';
 
   nativeBuildInputs = [

pkgs/by-name/ta/taler-sync/package.nix

@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-sync";
-  version = "1.0.0";
+  version = "1.3.0";
 
   src = fetchgit {
     url = "https://git.taler.net/sync.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-di+AgCCgOTvzR6Fberz1ISo6ZT+OsKikeNCU2HZHSz4=";
+    hash = "sha256-1m26ORKsN0GHJWQ/5gtMO3x1ng+GsZK9Y80413vF5pI=";
   };
 
   strictDeps = true;

pkgs/by-name/ta/taler-wallet-core/package.nix

@@ -40,12 +40,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taler-wallet-core";
-  version = "1.0.12";
+  version = "1.3.1";
 
   src = fetchgit {
     url = "https://git.taler.net/taler-typescript-core.git";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lTFiaIgkPw0FhrpYPwg5/MMl8Yo1MfkDPYEDSJ11rQ8=";
+    hash = "sha256-YTFS4s8GuC3SQ/b4JJ5DbEbzc8hrywYaf6rtSKGiSpE=";
   };
 
   nativeBuildInputs = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
     fetcherVersion = 1;
-    hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
+    hash = "sha256-jwoSvqE0hqRxu76vDtUOpZxvi4SsmKukfpmp5G6ZV/I=";
   };
 
   buildInputs = [ nodejs_20 ];