From b2bf187a44ee637de968ba7e539d8b6252e67d58 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Fri, 27 Sep 2019 15:47:15 -0400 Subject: [PATCH] Bump to current PaymentServer master@HEAD This gives us the merged version of Ristretto support. --- nixos/pkgs/zkapissuer-repo.nix | 9 +++++++++ nixos/pkgs/zkapissuer.nix | 9 ++------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 nixos/pkgs/zkapissuer-repo.nix diff --git a/nixos/pkgs/zkapissuer-repo.nix b/nixos/pkgs/zkapissuer-repo.nix new file mode 100644 index 00000000..6130fc44 --- /dev/null +++ b/nixos/pkgs/zkapissuer-repo.nix @@ -0,0 +1,9 @@ +let + pkgs = import <nixpkgs> {}; +in + pkgs.fetchFromGitHub { + owner = "PrivateStorageio"; + repo = "PaymentServer"; + rev = "94fb418962abee71fa97c09c76e85ccc13cf4c1e"; + sha256 = "15v71hqhs3rd8c77igbzbi2lbvrb6yyshasq3ijs51w7pwp10dac"; + } \ No newline at end of file diff --git a/nixos/pkgs/zkapissuer.nix b/nixos/pkgs/zkapissuer.nix index 2cee8ea4..2cf44d8f 100644 --- a/nixos/pkgs/zkapissuer.nix +++ b/nixos/pkgs/zkapissuer.nix @@ -1,10 +1,5 @@ -{ fetchFromGitHub, callPackage }: +{ callPackage }: let - paymentServer = fetchFromGitHub { - owner = "PrivateStorageio"; - repo = "PaymentServer"; - rev = "6fbaac7a14d2a03b74e10a4a82b1147ee1dd7d49"; - sha256 = "0z8mqmns3fqbjy765830s5q6lhz3lxmslxahjc155jsv5b46gjip"; - }; + paymentServer = import ./zkapissuer-repo.nix; in (callPackage "${paymentServer}/nix" { }).PaymentServer -- GitLab