mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

eval-config: remove compatibility shims

Browse source 
20.03 and 22.03 are both deprecated.
This commit is contained in:
Emily 2023-06-22 13:08:42 +01:00
parent 42d1643e7a
commit 9d6702cf2b
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
eval-config.nix
View file

@ -42,24 +42,14 @@ let
}; };
}; };
libExtended = lib.extend (self: super: { eval = lib.evalModules (builtins.removeAttrs args [ "lib" "inputs" "pkgs" "system" ] // {
# Added in nixpkgs #136909, adds forward compatibility until 22.03 is deprecated.
literalExpression = super.literalExpression or super.literalExample;
literalDocBook = super.literalDocBook or super.literalExample;
});
eval = libExtended.evalModules (builtins.removeAttrs args [ "lib" "inputs" "pkgs" "system" ] // {
modules = modules ++ [ argsModule pkgsModule ] ++ baseModules; modules = modules ++ [ argsModule pkgsModule ] ++ baseModules;
specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs; specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
}); });
# Was moved in nixpkgs #82751, so both need to be handled here until 20.03 is deprecated.
# https://github.com/NixOS/nixpkgs/commits/dcdd232939232d04c1132b4cc242dd3dac44be8c
_module = eval._module or eval.config._module;
in in
{ {
inherit (_module.args) pkgs; inherit (eval._module.args) pkgs;
inherit (eval) options config; inherit (eval) options config;
system = eval.config.system.build.toplevel; system = eval.config.system.build.toplevel;