Move primop registration to the plugin mechanism.

Author: shlevy

src/libexpr/primops.cc

@@ -11,7 +11,6 @@
 #include "json.hh"
 #include "value-to-json.hh"
 #include "value-to-xml.hh"
-#include "primops.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -2023,21 +2022,6 @@ static void prim_fetchTarball(EvalState & state, const Pos & pos, Value * * args
 }
 
 
-/*************************************************************
- * Primop registration
- *************************************************************/
-
-
-RegisterPrimOp::PrimOps * RegisterPrimOp::primOps;
-
-
-RegisterPrimOp::RegisterPrimOp(std::string name, size_t arity, PrimOpFun fun)
-{
-    if (!primOps) primOps = new PrimOps;
-    primOps->emplace_back(name, arity, fun);
-}
-
-
 void EvalState::createBaseEnv()
 {
     baseEnv.up = 0;
@@ -2224,10 +2208,6 @@ void EvalState::createBaseEnv()
     }
     addConstant("__nixPath", v);
 
-    if (RegisterPrimOp::primOps)
-        for (auto & primOp : *RegisterPrimOp::primOps)
-            addPrimOp(std::get<0>(primOp), std::get<1>(primOp), std::get<2>(primOp));
-
     for (const auto & plugin : settings.plugins.evalPlugins)
         plugin(*this);
 

src/libexpr/primops.hh

@@ -1,4 +1,3 @@
-#include "primops.hh"
 #include "eval-inline.hh"
 #include "download.hh"
 #include "store-api.hh"
@@ -238,6 +237,11 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
         state.allowedPaths->insert(gitInfo.storePath);
 }
 
-static RegisterPrimOp r("fetchGit", 1, prim_fetchGit);
+static void reg(EvalState & state)
+{
+    state.addPrimOp("fetchGit", 1, prim_fetchGit);
+}
+
+static RegisterPlugin r(Plugin(PluginTag<PluginType::EvalPlugin>(), reg));
 
 }

src/libexpr/primops/fetchGit.cc

@@ -1,4 +1,3 @@
-#include "primops.hh"
 #include "eval-inline.hh"
 #include "download.hh"
 #include "store-api.hh"
@@ -204,6 +203,11 @@ static void prim_fetchMercurial(EvalState & state, const Pos & pos, Value * * ar
         state.allowedPaths->insert(hgInfo.storePath);
 }
 
-static RegisterPrimOp r("fetchMercurial", 1, prim_fetchMercurial);
+static void reg(EvalState & state)
+{
+    state.addPrimOp("fetchMercurial", 1, prim_fetchMercurial);
+}
+
+static RegisterPlugin r(Plugin(PluginTag<PluginType::EvalPlugin>(), reg));
 
 }

src/libexpr/primops/fetchMercurial.cc

@@ -11,7 +11,8 @@
  *   1. Construct a nix::RegisterPlugin before the call to
  *      initPlugins(), usually as a static initialization. This can be
  *      used by nix itself, external programs using libnixmain
- *      directly, or LD_PRELOADed libraries.
+ *      directly, or LD_PRELOADed libraries. See the bottom of
+ *      src/libexpr/primops/fetchGit.cc for an example.
  *   2. Add a file to the 'plugin-files' nix configuration setting. It
  *      is expected that that file can be safely dlopened by nix (i.e.
  *      it is a DSO compiled against the same headers as the running