Unverified Commit fc0fe6e8 authored by Shea Levy's avatar Shea Levy
Browse files

nix-plugins: 9.0.0 -> 10.0.0

parent f040a9d3
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -2,17 +2,15 @@

stdenv.mkDerivation rec {
  pname = "nix-plugins";
  version = "9.0.0";
  version = "10.0.0";

  src = fetchFromGitHub {
    owner = "shlevy";
    repo = "nix-plugins";
    rev = version;
    hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64=";
    hash = "sha256-7Lo+YxpiRz0+ZLFDvYMJWWK2j0CyPDRoP1wAc+OaPJY=";
  };

  patches = [ ./nix-2.9.patch ];

  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ nix boost ];
+0 −35
Original line number Diff line number Diff line
diff --git a/extra-builtins.cc b/extra-builtins.cc
index 617807a..c417cb3 100644
--- a/extra-builtins.cc
+++ b/extra-builtins.cc
@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
 
 static GlobalConfig::Register rp(&extraBuiltinsSettings);
 
-static void extraBuiltins(EvalState & state, const Pos & pos,
+static void extraBuiltins(EvalState & state, const PosIdx pos,
     Value ** _args, Value & v)
 {
     static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile);
@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
             auto attrs = state.buildBindings(2);
 
             auto sExec = state.symbols.create("exec");
-            attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec });
+            attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" });
 
             auto sImportNative = state.symbols.create("importNative");
-            attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative });
+            attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" });
 
             arg = state.allocValue();
             arg->mkAttrs(attrs);
@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
 static RegisterPrimOp rp1("__extraBuiltins", 0,
     extraBuiltins);
 
-static void cflags(EvalState & state, const Pos & _pos,
+static void cflags(EvalState & state, const PosIdx _pos,
     Value ** _args, Value & v)
 {
     auto attrs = state.buildBindings(3);