From fc0fe6e82658aef8e87dd99b870f899e34019e94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 14 Sep 2022 06:28:17 -0400 Subject: [PATCH] nix-plugins: 9.0.0 -> 10.0.0 --- .../libraries/nix-plugins/default.nix | 6 ++-- .../libraries/nix-plugins/nix-2.9.patch | 35 ------------------- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/nix-plugins/nix-2.9.patch diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index e626c3abfe2fa6..e801a9c0ee55a0 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/nix-plugins/nix-2.9.patch b/pkgs/development/libraries/nix-plugins/nix-2.9.patch deleted file mode 100644 index f1dc2909175d92..00000000000000 --- a/pkgs/development/libraries/nix-plugins/nix-2.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -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);