From 3be5b19b3cb052eb32edaabc0f4611752be6ac6f Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 15 Jul 2023 03:32:45 +0200 Subject: [PATCH 1/3] gnunet: 0.17.6 -> 0.19.4 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 366af7121e67..2fdaf3c52f42 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.17.6"; + version = "0.19.4"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-JJNY7zsQzpmBB4H+2uxSam6rlDwSDku6CWrt+Rwa/EA="; + sha256 = "sha256-AKY99AjVmH9bqaUEQfKncYK9n7MvHjAq5WOslOesAJs="; }; enableParallelBuilding = true; From 3cb419b2ac5dfc2c978d434dc892aa38f11d690b Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 16 Jul 2023 19:09:03 +0200 Subject: [PATCH 2/3] gnunet-gtk: 0.15.0 -> 0.19.0 --- pkgs/applications/networking/p2p/gnunet/gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 369244604a88..739c3013e526 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.15.0"; + version = "0.19.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-FLLlqpQ7Bf+oNRUvx7IniVxFusy/tPYxEP2T6VGF7h8="; + sha256 = "sha256-MwAWs1rHXYlRUcAWX8LnCLTwEOSI68aA0s7uZGgYR3w="; }; nativeBuildInputs= [ From 0527714b6eb8efba30e5382fc05a2a7533b84bd7 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 21 Jul 2023 01:21:43 +0200 Subject: [PATCH 3/3] taler: unstable -> 0.9.2 --- .../applications/networking/taler/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index d91ba790610e..748c97b51b62 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -4,23 +4,24 @@ }: let - taler-merchant-backoffice = fetchgit { - url = "https://git.taler.net/merchant-backoffice.git"; - # branch "prebuilt" as of 2022-07-01 - rev = "1ef7150f32960cb65ebea67839cd5023f29a3d1d"; - sha256 = "sha256-ZtLYWHi6l5DxFvDm8RFGUD0BiAfJXCZr/ggrP3Uw7/0="; + version = "0.9.2"; + + taler-wallet-core = fetchgit { + url = "https://git.taler.net/wallet-core.git"; + rev = "v${version}"; + sha256 = "sha256-DTnwj/pkowR1b1+N94pnuLykD2O37Nh8AKhUIzY7NaU="; }; in rec { taler-exchange = stdenv.mkDerivation rec { pname = "taler-exchange"; - version = "unstable-2022-07-17"; + inherit version; src = fetchgit { url = "https://git.taler.net/exchange.git"; - rev = "93b45e62eef254eae68bc119b9770e97bae2c9fa"; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-BQxbwEf0wIkBOBVsPgMkMvUj4kFReXMUFTiSG0jXOJ0="; + sha256 = "sha256-c0cX38hDIZGVhHrD9LgDU70dF2AYuZmsakC8yDyZE54="; }; nativeBuildInputs = [ @@ -42,7 +43,6 @@ in rec { ]; propagatedBuildInputs = [ gnunet ]; - configureFlags = [ "--with-gnunet=${gnunet}" ]; preConfigure = '' ./contrib/gana-update.sh ''; @@ -73,15 +73,15 @@ in rec { taler-merchant = stdenv.mkDerivation rec { pname = "taler-merchant"; - version = "unstable-2022-07-11"; + inherit version; src = fetchgit { url = "https://git.taler.net/merchant.git"; - rev = "960dcacf25e51cc2bff359ea1fc86cdd3d9e6083"; - sha256 = "sha256-Wn11z6YjnylZl3z2JjBlrtZ1KHfQUHLIYWo5F+mAmNo="; + rev = "v${version}"; + sha256 = "sha256-NPK8yhuTtZZiWE7OsUMdlb2aycegPzRFud41xHE9IL8="; }; postUnpack = '' - ln -s ${taler-merchant-backoffice}/spa.html $sourceRoot/contrib/ + ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ ''; nativeBuildInputs = [ pkg-config autoreconfHook ];