Merge remote-tracking branch 'origin/master' into auto-uid-allocation

1 files changed, 10 insertions, 4 deletions

diff --git a/src/libutil/experimental-features.hh b/src/libutil/experimental-features.hh
index 00df8b165..c749d4767 100644
--- a/src/libutil/experimental-features.hh
+++ b/src/libutil/experimental-features.hh
@@ -16,10 +16,13 @@ namespace nix {
 enum struct ExperimentalFeature
 {
     CaDerivations,
+    ImpureDerivations,
     Flakes,
     NixCommand,
     RecursiveNix,
     NoUrlLiterals,
+    FetchClosure,
+    ReplFlake,
     AutoAllocateUids,
     SystemdCgroup,
 };
@@ -49,10 +52,13 @@ public:
     ExperimentalFeature missingFeature;
 
     MissingExperimentalFeature(ExperimentalFeature);
-    virtual const char * sname() const override
-    {
-        return "MissingExperimentalFeature";
-    }
 };
 
+/**
+ * Semi-magic conversion to and from json.
+ * See the nlohmann/json readme for more details.
+ */
+void to_json(nlohmann::json &, const ExperimentalFeature &);
+void from_json(const nlohmann::json &, ExperimentalFeature &);
+
 }