[Nix-dev] Re: Re: [Nix-commits] SVN commit: nix - r29021 - nixos/trunk/modules/misc

[Yury G. Kudryashov]

Nicolas Pierron wrote:

> Hi Yury,
> 
> Don't worry, If migration there is, it would take time and both syntax
> would likely be supported at the same time until one gets deprecated.
> The modification made for nixpkgs.config handle a new syntax in
> addition to the previous one.  So if something is no longer working
> warn me.
The syntax
nixpkgs.config.packageOverrides = p: { a = p.a.override { ... }; };
does not work anymore. The proposed patch is attached.
> 
-- 
Yury G. Kudryashov,
mailto: ur...@mccme.ru
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 78c52bc..73332bd 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -11,7 +11,11 @@ let
     then f x
     else f;
 
-  mergeConfig = lhs: rhs:
+  mergeConfig = lhs_: rhs_:
+    let
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
+    in
     lhs // rhs //
     optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:


_______________________________________________
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev