diff options
| -rw-r--r-- | tvix/eval/src/builtins/mod.rs | 6 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 848ac9e25dca..61ff60fa059c 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -374,6 +374,12 @@ fn pure_builtins() -> Vec<Builtin> { fn builtins_set() -> NixAttrs { let mut map: BTreeMap<NixString, Value> = BTreeMap::new(); + // Pure-value builtins + map.insert( + "nixVersion".into(), + Value::String("2.3-compat-tvix-0.1".into()), + ); + let mut add_builtins = |builtins: Vec<Builtin>| { for builtin in builtins { map.insert(builtin.name().into(), Value::Builtin(builtin)); diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp new file mode 100644 index 000000000000..3a2e3f4984a0 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp @@ -0,0 +1 @@ +-1 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix new file mode 100644 index 000000000000..6f353056127c --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix @@ -0,0 +1,5 @@ +# nixpkgs checks against the `builtins.nixVersion` and fails if it +# doesn't like what it sees. To work around this we have a "user-agent +# style" version (see cl/6858) that ensures compatibility. + +builtins.compareVersions "2.3" builtins.nixVersion |