Skip to content
Snippets Groups Projects
Unverified Commit 24c19c19 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Bump it again for python-challenge-bypass-ristretto update

parent 36b4050c
Branches
No related tags found
1 merge request!26Update PaymentServer and improve secret handling
......@@ -4,7 +4,16 @@
{ pkgs }:
import pkgs.path {
overlays = [
(import ./zkap-overlay.nix)
# For some reason the order of these overlays matters. Maybe it has to do
# with our python27 override, I'm not sure. In the other order, we end up
# with two derivations of each of Twisted and treq which conflict with
# each other.
(import ./overlays.nix)
# It might be nice to eventually remove this. ZKAPAuthorizer now
# self-applies this overlay without our help. We only still have it
# because it also defines tahoe-lafs which we want to use. We can't see
# tahoe-lafs from the self-applied overlay because that overlay is applied
# to ZKAPAuthorizer's nixpkgs, not to the one we're using.
(import ./zkap-overlay.nix)
];
}
......@@ -4,6 +4,6 @@ in
pkgs.fetchFromGitHub {
owner = "PrivateStorageio";
repo = "PaymentServer";
rev = "d7ba9ffd970d7b4caa99ba93433f613d4773b17c";
sha256 = "0h086173m6ih24wmdy7jshwv7ihl17wh7qir2x4slwydhyrfrwjk";
rev = "d6ad0042842ca0501c1e378b19bfdb42d5644223";
sha256 = "018ybp83ljdwjn2kv1smkb5rx5h0hgw17a452bsyxdq61ysv4ajv";
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment