Unverified Commit 1708e6ad authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #243572 from astro/gnunet

parents 46b4056e 0527714b

pkgs/applications/networking/p2p/gnunet/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/applications/networking/p2p/gnunet/gtk.nix

+2 −2
Original line number Diff line number Diff line
@@ -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= [

pkgs/applications/networking/taler/default.nix

+13 −13
Original line number Diff line number Diff line
@@ -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 ];