diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2026-02-06 09:42:40 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2026-02-06 09:42:40 +0100 |
| commit | 0ba501917e5f757eee561bf9f7bf6a2a85d99dc1 (patch) | |
| tree | 22805e9637d7dc8fee6491d36512b9b4ac963639 /system-profiles/core/default.nix | |
| parent | 493a0aa7fe977cfad22b872b95cc90e7d0d96550 (diff) | |
| download | nixos-0ba501917e5f757eee561bf9f7bf6a2a85d99dc1.tar nixos-0ba501917e5f757eee561bf9f7bf6a2a85d99dc1.tar.gz nixos-0ba501917e5f757eee561bf9f7bf6a2a85d99dc1.tar.bz2 nixos-0ba501917e5f757eee561bf9f7bf6a2a85d99dc1.tar.xz nixos-0ba501917e5f757eee561bf9f7bf6a2a85d99dc1.zip | |
bump
Diffstat (limited to 'system-profiles/core/default.nix')
| -rw-r--r-- | system-profiles/core/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index 258dd32d..58d2fe7c 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix | |||
| @@ -62,6 +62,9 @@ in { | |||
| 62 | rhs = optCall rhs_ { inherit pkgs; }; | 62 | rhs = optCall rhs_ { inherit pkgs; }; |
| 63 | in | 63 | in |
| 64 | recursiveUpdate lhs rhs // | 64 | recursiveUpdate lhs rhs // |
| 65 | optionalAttrs (lhs ? allowUnfreePackages) { | ||
| 66 | allowUnfreePackages = lhs.allowUnfreePackages ++ (attrByPath [ "allowUnfreePackages" ] [ ] rhs); | ||
| 67 | } // | ||
| 65 | optionalAttrs (lhs ? packageOverrides) { | 68 | optionalAttrs (lhs ? packageOverrides) { |
| 66 | packageOverrides = pkgs: | 69 | packageOverrides = pkgs: |
| 67 | optCall lhs.packageOverrides pkgs // | 70 | optCall lhs.packageOverrides pkgs // |