Unverified Commit 80b802f5 authored by misuzu's avatar misuzu Committed by GitHub
Browse files

taler: 0.13 -> 0.14 (#370096)

parents d9be5180 2730726c

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.22.1";

  version = "0.23.1";



  src = fetchurl {

    url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";

    hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o=";

    hash = "sha256-b9BbaQdrOxqOfiCyVOBE/dTG2lMTGWMX894Ij30CXPI=";

  };



  enableParallelBuilding = true;

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

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 


stdenv.mkDerivation rec {

  pname = "gnunet-gtk";

  version = "0.22.0";

  version = "0.23.1";



  src = fetchurl {

    url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz";

    hash = "sha256-bpSEdymFT7q5OQKshD8lGwwMF26yXp0RyUAvNVzua6U=";

    hash = "sha256-bmU3799pZVUyrsJ92MKgn5NIqCW76ml4N42Ewi+VWvI=";

  };



  nativeBuildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "taler-challenger";

  version = "0.13.0";

  version = "0.14.1";



  src = fetchgit {

    url = "https://git.taler.net/challenger.git";

    rev = "v${finalAttrs.version}";

    hash = "sha256-OlUgE40Qo7on9VaMGKJ/MRWActDBqPe7Ja95dv1OFhA=";

    hash = "sha256-W7oImw5ptrLVIK8KPtmb7PJKSpmh8KsazxV6reUoRO8=";

  };



  # https://git.taler.net/challenger.git/tree/bootstrap

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

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "taler-exchange";

  version = "0.13.0";

  version = "0.14.1";



  src = fetchgit {

    url = "https://git.taler.net/exchange.git";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-elVZUuiIMLOG058n+Egpy9oD9T2sLDC4TUCYZTCi0bw=";

    hash = "sha256-DD6fX54K1q4f2d/IqC+urVpMkypDRaL3lrBoQieGviI=";

  };



  patches = [ ./0001-add-TALER_TEMPLATING_init_path.patch ];

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

+4 −4
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "taler-merchant";

  version = "0.13.0";

  version = "0.14.1";



  src = fetchgit {

    url = "https://git.taler.net/merchant.git";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-N3atOOE21OEks3G1LPOM5qo/kq0D5D9gmTfURCBZx6M=";

    hash = "sha256-ac7ajHBLW6BJrL0iaa+b7XNZHMEEmbAo17URIdPSXd8=";

  };



  postUnpack = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # path to the `taler-exchange` package is used.

  postPatch = ''

    substituteInPlace src/backend/taler-merchant-httpd.c \

      --replace-fail 'TALER_TEMPLATING_init ("merchant");' "TALER_TEMPLATING_init_path (\"merchant\", \"$out/share/taler\");"

      --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/\","
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # NOTE: The executables that need database access fail to detect the

  # postgresql library in `$out/lib/taler`, so we need to wrap them.

  postInstall = ''

    for exec in dbinit httpd webhook wirewatch depositcheck exchange; do

    for exec in dbinit httpd webhook wirewatch depositcheck exchangekeyupdate; do

      wrapProgram $out/bin/taler-merchant-$exec \

        --prefix LD_LIBRARY_PATH : "$out/lib/taler"

    done