From 24c19c19cf36df6f5516ebafc4e9a8f81bb8c117 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 7 Apr 2020 10:28:18 -0400
Subject: [PATCH] Bump it again for python-challenge-bypass-ristretto update
---
nixos/modules/pspkgs.nix | 11 ++++++++++-
nixos/pkgs/zkapissuer-repo.nix | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/pspkgs.nix b/nixos/modules/pspkgs.nix
index 851f4e71..11ef8992 100644
--- a/nixos/modules/pspkgs.nix
+++ b/nixos/modules/pspkgs.nix
@@ -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)
];
}
diff --git a/nixos/pkgs/zkapissuer-repo.nix b/nixos/pkgs/zkapissuer-repo.nix
index 9ea98549..66d3bf2f 100644
--- a/nixos/pkgs/zkapissuer-repo.nix
+++ b/nixos/pkgs/zkapissuer-repo.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
--
GitLab