From 971ac6f0ff28b43f8b7427eeeaf9c93fec6bd77c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 18 Oct 2019 14:27:41 -0400
Subject: [PATCH] Avoid trying to compose if there isn't a second thing to
compose with
---
nixos/modules/overlays.nix | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/overlays.nix b/nixos/modules/overlays.nix
index 779384ab..a644e630 100644
--- a/nixos/modules/overlays.nix
+++ b/nixos/modules/overlays.nix
@@ -34,6 +34,10 @@ self: super: {
# the value from the previously overlay, not from the fixed point. This is
# important because this override never converges.
python27 = super.python27.override (old: {
- packageOverrides = super.lib.composeExtensions old.packageOverrides pythonTwistedOverride;
+ packageOverrides =
+ if old ? packageOverrides then
+ super.lib.composeExtensions old.packageOverrides pythonTwistedOverride
+ else
+ pythonTwistedOverride;
});
}
--
GitLab