0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-02 18:01:20 +00:00 committed by GitHub
commit 0630061ef3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 48 additions and 26 deletions

View file

@ -6,7 +6,9 @@ with lib;
let
etc' = filter (f: f.enable) (attrValues config.environment.etc);
# if the source is a local file, it should be imported to the store
localToStore = mapAttrs (name: value: if name == "source" then "${value}" else value);
etc' = map localToStore (filter (f: f.enable) (attrValues config.environment.etc));
etc = pkgs.runCommandLocal "etc" {
# This is needed for the systemd module