From f1502c49c8bd9f3916560f4d6c4228e278bc1308 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:41:46 +0200 Subject: [PATCH 1/6] gnunet: add patch for taler-merchant --- pkgs/applications/networking/p2p/gnunet/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 3f5e2f7c58a2..127ef4ffab3d 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor +{ lib, stdenv, fetchurl, fetchpatch, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-k+aLPqynCHJz49doX+auOLLoBV5MnnANNg3UBVJJeFw="; }; + patches = [ + (fetchpatch { + name = "add-pq-result-and-query-helpers-for-blind-sign-keys.patch"; + url = "https://git.gnunet.org/gnunet.git/patch/?id=ca828a0edb853ef841620253c8e56ad5eae16014"; + hash = "sha256-6CiEm2CRIhmK1jgTpSEfUwqZNfldokeGoo4fl9AcBcQ="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config libtool makeWrapper ]; From 22a063811e95080591caea1daf5ced0933463403 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:41:59 +0200 Subject: [PATCH 2/6] taler-exchange: 0.10.2 -> 0.11.2 --- pkgs/by-name/ta/taler-exchange/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index d5139dafaa6b..4f3b158522f0 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -21,7 +21,7 @@ }: let - version = "0.10.2"; + version = "0.11.2"; in stdenv.mkDerivation { pname = "taler-exchange"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-dl8lZ7uKUr+KSUaT4xlkaX3W5UoW2Zfu/0iVXvLejnA="; + hash = "sha256-DflUfXAe310LRhZmaHgF1ZpCi+hHF30lpzAIpI1HZvM="; }; nativeBuildInputs = [ From 89ae43089fb98a6de13ec33e64574d0d04f0215a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:42:15 +0200 Subject: [PATCH 3/6] taler-merchant: 0.10.2 -> 0.11.3 --- pkgs/by-name/ta/taler-merchant/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index 59fb722b72fc..65367499e23c 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -12,12 +12,13 @@ }: let - version = "0.10.2"; + version = "0.11.3"; taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; - rev = "v${version}"; - hash = "sha256-jC8XhcHZxv7ww+wspJUqTq6x6FIeEehQmE03ttJZWT4="; + # https://taler.net/fr/news/2024-11.html + rev = "v0.11.2"; + hash = "sha256-GtR87XqmunYubh9EiY3bJIqXiXrT+re3KqWypYK3NCo="; }; in stdenv.mkDerivation { @@ -28,7 +29,7 @@ stdenv.mkDerivation { url = "https://git.taler.net/merchant.git"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-WY5Fk5HcVjxsnqt69m8E9ikW+nQDkCuKtT1CTsupz5c="; + hash = "sha256-Rak6p8cuCHPZxrXqrv3YUU3pFFw4GWf8bcd3Ur+o7Wg="; }; postUnpack = '' From 6649f40ab96c19279f7f9a952e988d0dee2cfabe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:42:44 +0200 Subject: [PATCH 4/6] sync: 0.10.0 -> 0.11.0 --- pkgs/by-name/sy/sync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/sync/package.nix b/pkgs/by-name/sy/sync/package.nix index e96aa738d2c1..2ac766a4efbd 100644 --- a/pkgs/by-name/sy/sync/package.nix +++ b/pkgs/by-name/sy/sync/package.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "sync"; - version = "0.10.1"; + version = "0.11.0"; src = fetchgit { url = "https://git.taler.net/sync.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-7EBm4Zp1sjZw7pXxQySY+1It3C/KLG2SHhqUPhDATbg="; + hash = "sha256-IGYc4Olbn9lVnN1THR2BXzllD1li/vhWwHg+1WU84YM="; }; strictDeps = true; From 275236f0be322314e6b5a7c85a000528ad1d8027 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:42:53 +0200 Subject: [PATCH 5/6] challenger: 0.10.0 -> 0.11.0 --- pkgs/by-name/ch/challenger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/challenger/package.nix b/pkgs/by-name/ch/challenger/package.nix index ca3a7cf36534..108c7a77eaea 100644 --- a/pkgs/by-name/ch/challenger/package.nix +++ b/pkgs/by-name/ch/challenger/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "challenger"; - version = "0.10.0"; + version = "0.11.0"; src = fetchgit { url = "https://git.taler.net/challenger.git"; rev = "v${finalAttrs.version}"; - hash = "sha256-fjT3igPQ9dQtOezwZVfK5fBaL22FKOCbjUF0U1urK0g="; + hash = "sha256-utME8ywCf4hjgOZWp4j2+dNPPLbAqHd80A62waVvONE="; }; # https://git.taler.net/challenger.git/tree/bootstrap From 9a6ad061d10f1034a3428191081e81d4a3112b78 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:55:28 +0200 Subject: [PATCH 6/6] gnunet: 0.21.1 -> 0.21.2 --- .../applications/networking/p2p/gnunet/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 127ef4ffab3d..43f0b97c9ff0 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, adns, curl, gettext, gmp, gnutls, libextractor +{ lib, stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium @@ -7,21 +7,13 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz"; - hash = "sha256-k+aLPqynCHJz49doX+auOLLoBV5MnnANNg3UBVJJeFw="; + hash = "sha256-jCNRJo6bi6KtKIuLM3zjmfecGOP/2WCAP07V3n3an6E="; }; - patches = [ - (fetchpatch { - name = "add-pq-result-and-query-helpers-for-blind-sign-keys.patch"; - url = "https://git.gnunet.org/gnunet.git/patch/?id=ca828a0edb853ef841620253c8e56ad5eae16014"; - hash = "sha256-6CiEm2CRIhmK1jgTpSEfUwqZNfldokeGoo4fl9AcBcQ="; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkg-config libtool makeWrapper ];