Apply suggestions from code review

Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
This commit is contained in:
tomberek 2022-01-14 09:16:34 -05:00 committed by GitHub
parent f404189368
commit 2dead20924
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 13 deletions

View file

@ -1,16 +1,5 @@
# Release X.Y (202?-??-??) # Release X.Y (202?-??-??)
* The Nix cli now searches for a flake.nix up until the root of the current git repository or a filesystem boundary rather than just in the current directory
* Binary cache stores now have a setting `compression-level`.
* `nix develop` now has a flag `--unpack` to run `unpackPhase`.
* Lists can now be compared lexicographically using the `<` operator.
* New built-in function: `builtins.groupBy`, with the same functionality as
Nixpkgs' `lib.groupBy`, but faster.
* Nix now searches for a flake.nix up until git or filesystem boundary.
* The TOML parser used by `builtins.fromTOML` has been replaced by [a * The TOML parser used by `builtins.fromTOML` has been replaced by [a
more compliant one](https://github.com/ToruNiina/toml11). more compliant one](https://github.com/ToruNiina/toml11).

View file

@ -136,7 +136,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
throw Error("unable to find a flake before encountering git boundary at '%s'", path); throw Error("unable to find a flake before encountering git boundary at '%s'", path);
else { else {
if (lstat(path).st_dev != device) if (lstat(path).st_dev != device)
throw Error("unable to find a flake before encountering filesystem boundary at '%s'", path); throw Error("path '%s' is not part of a flake (neither it nor its parent directories contain a 'flake.nix' file)", origPath);
} }
path = dirOf(path); path = dirOf(path);
} }