wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 01:11:15 +02:00
Code Activity

Merge pull request #9233 from bouk/bouk/apply-config-inner

Browse source 
config: add included files into parsedContents before applying
This commit is contained in:
John Ericson 2023-12-01 08:23:32 -05:00 • committed by GitHub
commit 82359eba6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/config.hh
View file

@ -82,12 +82,6 @@ public:
*/
void applyConfig(const std::string & contents, const std::string & path = "<unknown>");
/**
* Applies a nix configuration file
* - path: the location of the config file to apply
*/
void applyConfigFile(const Path & path);
/**
* Resets the `overridden` flag of all Settings
*/