From 7fe1331570918e9eae2a9868497afba7f61ad742 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 4 Oct 2022 18:40:57 +0300 Subject: feat(tvix/eval): implement tvix's user-agent, err, nixVersion nixpkgs has hardcoded references to Nix versions, we need to provide it with something that looks like a Nix version while actually being a Tvix version. For now, we do this by stealing a trick out of the browser book and constructing a version that looks like a Nix version to Nix, but like a Tvix version to people who know what they are looking for. Nevermind that we don't actually have any kind of versioning for Tvix (yet?), other than depot revisions. Change-Id: I7ce8079dd8164a2079891d38e707f09a45f0bbc1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6858 Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 6 ++++++ tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-nix-version-cmp.nix diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 848ac9e25d..61ff60fa05 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -374,6 +374,12 @@ fn pure_builtins() -> Vec { fn builtins_set() -> NixAttrs { let mut map: BTreeMap = BTreeMap::new(); + // Pure-value builtins + map.insert( + "nixVersion".into(), + Value::String("2.3-compat-tvix-0.1".into()), + ); + let mut add_builtins = |builtins: Vec| { 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 0000000000..3a2e3f4984 --- /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 0000000000..6f35305612 --- /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 -- cgit 1.4.1