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

Flake alias -> id

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-20 14:46:37 +02:00
parent 68e0f23edc
commit 5961c94097
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/flake/flakeref.hh
View file

@ -101,16 +101,15 @@ namespace nix {
*/
typedef std::string FlakeId;
typedef std::string FlakeAlias;
typedef std::string FlakeUri;
struct FlakeRef
{
struct IsAlias
struct IsId
{
FlakeAlias alias;
bool operator<(const IsAlias & b) const { return alias < b.alias; };
bool operator==(const IsAlias & b) const { return alias == b.alias; };
FlakeId id;
bool operator<(const IsId & b) const { return id < b.id; };
bool operator==(const IsId & b) const { return id == b.id; };
};
struct IsGitHub {
@ -140,7 +139,7 @@ struct FlakeRef
// Git, Tarball
std::variant<IsAlias, IsGitHub, IsGit, IsPath> data;
std::variant<IsId, IsGitHub, IsGit, IsPath> data;
std::optional<std::string> ref;
std::optional<Hash> rev;
@ -168,7 +167,7 @@ struct FlakeRef
a flake ID, which requires a lookup in the flake registry. */
bool isDirect() const
{
return !std::get_if<FlakeRef::IsAlias>(&data);
return !std::get_if<FlakeRef::IsId>(&data);
}
/* Check whether this is an "immutable" flake reference, that is,