From bbffaf7b11bf5ef56663db4727f0cec4f004833c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 13 May 2021 09:55:40 -0400
Subject: [PATCH] Avoid the infinite recursion
The new binding completely obscures the old binding. The `else` case was
recursive with no base.
---
default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/default.nix b/default.nix
index 964e4af..9910ed3 100644
--- a/default.nix
+++ b/default.nix
@@ -8,9 +8,10 @@
let
pkgs' = pkgs.extend (import ./overlays.nix);
callPackage = pkgs'.python27Packages.callPackage;
- tahoe-lafs = if tahoe-lafs == null then pkgs.python2Packages.tahoe-lafs-1_14 else tahoe-lafs;
+ tahoe-lafs' = if tahoe-lafs == null then pkgs.python2Packages.tahoe-lafs-1_14 else tahoe-lafs;
in
callPackage ./zkapauthorizer.nix {
challenge-bypass-ristretto = callPackage ./python-challenge-bypass-ristretto.nix { };
- inherit hypothesisProfile collectCoverage testSuite trialArgs tahoe-lafs;
+ inherit hypothesisProfile collectCoverage testSuite trialArgs;
+ tahoe-lafs = tahoe-lafs';
}
--
GitLab