nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-16 14:01:05 +01:00
Code Activity

Fix handling of relative paths

Browse source 
In particular, 'path:..' got turned into 'path:.' because isRelative()
returned a CanonPath, which cannot represent '..'.

Reported by @erikarvstedt.
This commit is contained in:
Eelco Dolstra 2022-10-10 18:56:19 +02:00
parent 7317196807
commit 511590976c
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libfetchers/fetchers.hh
View file

@ -53,7 +53,7 @@ public:
/* Only for relative path flakes, i.e. 'path:./foo', returns the
relative path, i.e. './foo'. */
std::optional<CanonPath> isRelative() const;
std::optional<std::string> isRelative() const;
bool operator ==(const Input & other) const;
@ -138,7 +138,7 @@ struct InputScheme
virtual bool isLocked(const Input & input) const
{ return false; }
virtual std::optional<CanonPath> isRelative(const Input & input) const
virtual std::optional<std::string> isRelative(const Input & input) const
{ return std::nullopt; }
virtual std::optional<std::string> getFingerprint(ref<Store> store, const Input & input) const;