From fa97d795677432ceea46df9a6f609efbe3dbe90c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 4 May 2023 23:53:14 -0400 Subject: [PATCH] nix: Fix registry extra attrs not being applied This was mkDefault { } // filterAttrs () x which is interpreted as (mkDefault { }) // (filterAttrs () x) but the intention is mkDefault ({ } // filterAttrs () x) Resulting in lastModified, rev, etc. not being included. This is essentially just bringing this clause up-to-date with the one from NixOS. --- modules/nix/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 8a5bb18..cd66c59 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -444,13 +444,14 @@ in }; config = { from = mkDefault { type = "indirect"; id = name; }; - to = mkIf (config.flake != null) (mkDefault + to = mkIf (config.flake != null) (mkDefault ( { type = "path"; path = config.flake.outPath; } // filterAttrs - (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") - config.flake); + (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake + )); }; } ));