summaryrefslogtreecommitdiff
path: root/modules/nix/default.nix
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2023-05-04 23:53:14 -0400
committerAndrew Marshall <andrew@johnandrewmarshall.com>2023-05-04 23:53:14 -0400
commitfa97d795677432ceea46df9a6f609efbe3dbe90c (patch)
treeb0d2f4a518642f4d6edf3a0595d35bb9b9d77e5b /modules/nix/default.nix
parent379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8 (diff)
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.
Diffstat (limited to 'modules/nix/default.nix')
-rw-r--r--modules/nix/default.nix7
1 files 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
+ ));
};
}
));