diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-02-08 20:52:13 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-03-30 03:05:05 -0400 |
| commit | 4c0d7da1837356047aabfed4661daf4307821b75 (patch) | |
| tree | acc8f6a873c1bfa5f31f4beee022b7818fd56abb /lib | |
| parent | da79d1f01f6bd70833543cab5308d2439c429f9e (diff) | |
| download | nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar.gz nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar.bz2 nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar.lz nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar.xz nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.tar.zst nixpkgs-4c0d7da1837356047aabfed4661daf4307821b75.zip | |
Get rid of all `with { inherit... }` and just used `let inherit...`
The old forms presumably predates, or were made in ignorance of, `let inherit`. This way is better style as the scoping as more lexical, something which Nix can (or might already!) take advantage of.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 4 | ||||
| -rw-r--r-- | lib/types.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index c1bd764c70d..f9e6b7495fc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,12 +1,12 @@ # Operations on attribute sets. -with { +let inherit (builtins) head tail length; inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; -}; +in rec { inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; diff --git a/lib/types.nix b/lib/types.nix index 175cb7472bf..c834cc8e653 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -6,7 +6,7 @@ with import ./attrsets.nix; with import ./options.nix; with import ./trivial.nix; with import ./strings.nix; -with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; }; +let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in rec { |