diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-13 12:24:48 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-13 12:24:48 +0100 |
| commit | 7828dca9e8e62b6fc6283d2f0c08ecb38ab8b6ca (patch) | |
| tree | f8dc7e4d07209f47c9b18682c36712abe5850f24 /tests | |
| parent | 1c10a74c73e710d164d9e5c527f98b309a6f7b2c (diff) | |
| parent | 081f14a169d36243f97263acb41fb108af243619 (diff) | |
Merge branch 'register-constant' of https://github.com/shlevy/nix
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/plugins.sh | 2 | ||||
| -rw-r--r-- | tests/plugins/plugintest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/plugins.sh b/tests/plugins.sh index 6d18d1da0..23caf04f3 100644 --- a/tests/plugins.sh +++ b/tests/plugins.sh @@ -2,6 +2,6 @@ source common.sh set -o pipefail -res=$(nix eval '(builtins.constNull true)' --option plugin-files $PWD/plugins/plugintest.so) +res=$(nix eval '(builtins.anotherNull)' --option plugin-files $PWD/plugins/plugintest.so) [ "$res"x = "nullx" ] diff --git a/tests/plugins/plugintest.cc b/tests/plugins/plugintest.cc index f788c4814..6b5e6d7cd 100644 --- a/tests/plugins/plugintest.cc +++ b/tests/plugins/plugintest.cc @@ -2,9 +2,9 @@ using namespace nix; -static void prim_constNull (EvalState & state, const Pos & pos, Value ** args, Value & v) +static void prim_anotherNull (EvalState & state, const Pos & pos, Value ** args, Value & v) { mkNull(v); } -static RegisterPrimOp r("constNull", 1, prim_constNull); +static RegisterPrimOp r("anotherNull", 0, prim_anotherNull); |