From 8fb04c25c8a19505f776cbf0557df7d1607d7c28 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 16 Sep 2020 14:07:37 -0400
Subject: [PATCH] Pass our preferred tahoe-lafs to zkapauthorizer
---
nixos/modules/overlays.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/overlays.nix b/nixos/modules/overlays.nix
index 00e26dd1..59bcc514 100644
--- a/nixos/modules/overlays.nix
+++ b/nixos/modules/overlays.nix
@@ -13,9 +13,14 @@ let
inherit (python-super) twisted;
};
+ # Put in our preferred version of tahoe-lafs as well.
tahoe-lafs = python-self.callPackage ../pkgs/tahoe-lafs.nix { };
- zkapauthorizer = python-self.callPackage ../pkgs/zkapauthorizer.nix { };
+ # This is handy too...
+ zkapauthorizer = python-self.callPackage ../pkgs/zkapauthorizer.nix {
+ # And explicitly configure it with our preferred version of Tahoe-LAFS.
+ inherit tahoe-lafs;
+ };
};
in
self: super: {
@@ -30,7 +35,9 @@ self: super: {
# instead because it implies a whole mess of derivations (all of the Python
# modules available).
privatestorage = self.python27.buildEnv.override
- { extraLibs =
+ { # ... for dropin.cache
+ ignoreCollisions = true;
+ extraLibs =
[ self.python27Packages.tahoe-lafs
self.python27Packages.zkapauthorizer
];
--
GitLab