From 5bfcb79f257bf9c622277dffda4fbee73f551bd6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 27 Dec 2021 10:55:23 -0500
Subject: [PATCH] fix the new conditional foolscap dependency
---
default.nix | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/default.nix b/default.nix
index a0b529e..cee9ff5 100644
--- a/default.nix
+++ b/default.nix
@@ -62,11 +62,20 @@ in
# going on and discover the real version specified by `src` below.
version = "1.17.0.post999";
# See https://github.com/DavHau/mach-nix/issues/190
- requirementsExtra = ''
+ requirementsExtra =
+ let
+ foolscap-version =
+ if python <= "python30"
+ then "foolscap == 0.13.1"
+ else "foolscap >= 21.7.0";
+ in
+ ''
+ # See https://github.com/DavHau/mach-nix/issues/190
pyrsistent < 0.17
- foolscap == 0.13.1
configparser
eliot
+ ${foolscap-version}
+
# undetected cryptography build dependency
# https://github.com/DavHau/mach-nix/issues/305
setuptools_rust
--
GitLab