From 87a2f4f12996e99cb7c94b5b3b72cf0e4de75d02 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 16 Sep 2020 14:05:33 -0400
Subject: [PATCH] Use the preferred pkgs.extend instead of re-importing
pkg.path
Re-importing the path probably breaks other stuff. Anyway, we only have one
overlay now so this short/simpler thing works.
---
nixos/modules/pspkgs.nix | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/nixos/modules/pspkgs.nix b/nixos/modules/pspkgs.nix
index 031852c0..697bc5a0 100644
--- a/nixos/modules/pspkgs.nix
+++ b/nixos/modules/pspkgs.nix
@@ -1,9 +1,4 @@
-# Derive a brand new version of pkgs which has our overlays applied. This
-# includes our definition of the `privatestorage` derivation, a Python
-# environment with Tahoe-LAFS and ZKAPAuthorizer installed.
+# Derive a brand new version of pkgs which has our overlays applied. This is
+# where the `privatestorage` derivation is added to nixpkgs.
{ pkgs }:
-import pkgs.path {
- overlays = [
- (import ./overlays.nix)
- ];
-}
+pkgs.extend (import ./overlays.nix)
--
GitLab