wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code Activity

Make the Nix search path declarative

Browse source 
Nix search path lookups like <nixpkgs> are now desugared to ‘findFile
nixPath <nixpkgs>’, where ‘findFile’ is a new primop. Thus you can
override the search path simply by saying

  let
    nixPath = [ { prefix = "nixpkgs"; path = "/my-nixpkgs"; } ];
  in ... <nixpkgs> ...

In conjunction with ‘scopedImport’ (commit
c273c15cb1), the Nix search path can be
propagated across imports, e.g.

  let

    overrides = {
      nixPath = [ ... ] ++ builtins.nixPath;
      import = fn: scopedImport overrides fn;
      scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
      builtins = builtins // overrides;
    };

  in scopedImport overrides ./nixos
This commit is contained in:
Eelco Dolstra 2014-05-26 17:02:22 +02:00
parent 39d72640c2
commit 62a6eeb1f3
7 changed files with 51 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.hh
View file

@ -86,6 +86,9 @@ typedef std::map<Path, Path> SrcToStore;
std::ostream & operator << (std::ostream & str, const Value & v);
typedef list<std::pair<string, Path> > SearchPath;
class EvalState
{
public:
@ -111,7 +114,6 @@ private:
#endif
FileEvalCache fileEvalCache;
typedef list<std::pair<string, Path> > SearchPath;
SearchPath searchPath;
public:
@ -137,6 +139,7 @@ public:
/* Look up a file in the search path. */
Path findFile(const string & path);
Path findFile(SearchPath & searchPath, const string & path);
/* Evaluate an expression to normal form, storing the result in
value `v'. */