From 055608227f5a003825a905b0eb2aea39cba5ca16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Sep 2007 16:08:24 +0000 Subject: * nix-env: allow ~/.nix-defexpr to be a directory. If it is, then the Nix expressions in that directory are combined into an attribute set {file1 = import file1; file2 = import file2; ...}, i.e. each Nix expression is an attribute with the file name as the attribute name. Also recurses into directories. * nix-env: removed the "--import" (-I) option which set the ~/.nix-defexpr symlink. * nix-channel: don't use "nix-env --import", instead symlink ~/.nix-defexpr/channels. So finally nix-channel --update doesn't override any default Nix expressions but combines with them. This means that you can have (say) a local Nixpkgs SVN tree and use it as a default for nix-env: $ ln -s .../path-to-nixpkgs-tree ~/.nix-defexpr/nixpkgs_svn and be subscribed to channels (including Nixpkgs) at the same time. (If there is any ambiguity, the -A flag can be used to disambiguate, e.g. "nix-env -i -A nixpkgs_svn.pan".) --- src/libutil/util.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libutil') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index edfd26b0b..d8d3751a1 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -154,6 +154,7 @@ bool pathExists(const Path & path) Path readLink(const Path & path) { + checkInterrupt(); struct stat st; if (lstat(path.c_str(), &st)) throw SysError(format("getting status of `%1%'") % path); -- cgit v1.2.3