diff options
author | Silvan Mosberger <contact@infinisil.com> | 2019-08-10 20:59:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-10 20:59:50 +0200 |
commit | 5c7afdd607ee5cb923996617e7d919cf1b296794 (patch) | |
tree | 973623245d7fc38aee692f0118cc8d730bdf3104 | |
parent | 809b38a784ea413b36d188688eb1d2318e6438da (diff) | |
parent | ca3820dd002ac757518d22efcc7b05c59e67dc54 (diff) | |
download | nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar.gz nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar.bz2 nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar.lz nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar.xz nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.tar.zst nixlib-5c7afdd607ee5cb923996617e7d919cf1b296794.zip |
Merge pull request #66450 from Infinisil/fix-nixpkgs.config-type
nixos/misc: Fix nixpkgs.config merge function
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e0c192246c0c..afb74581e239 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -19,7 +19,7 @@ let lhs = optCall lhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; }; in - lhs // rhs // + recursiveUpdate lhs rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // |