diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-08-25T11·23+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-09-03T00·47+0000 |
| commit | 39b01c302937fe3e91c15758b520c3ecc5379c7b (patch) | |
| tree | cff95e288671533056fcea8a62e3fe620b77ef6d /third_party/overlays | |
| parent | 265393301e2b59659a0a5db15e42bc668d0c7c68 (diff) | |
fix(tvix/eval): correctly escape `${` in strings r/4607
Without this escape, it is possible for Nix to produce escaped representations which are not literal Nix values again. This was fixed in upstream Nix in https://github.com/NixOS/nix/pull/4012 (though only for eval, not in the REPL) and the updated test is picked from upstream after that commit. Because we run the C++ Nix tests against our test suite as well, this also bumps our custom Nix 2.3 to a commit that includes the cherry-picked fix from the PR above. Change-Id: I478547ade65f655c606ec46f7143932064192283 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6271 Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays')
| -rw-r--r-- | third_party/overlays/tvl.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 9bb88dc2bed9..412a605aa9e9 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -9,14 +9,14 @@ let nixSrc = let # branch 2.3-backport-await-users - rev = "4510dbc8a6802902cbab6444134659548fffb9b0"; + rev = "abdc60f49f1104696bac723331d3ed0296d5a784"; in self.fetchFromGitHub { owner = "tvlfyi"; repo = "nix"; inherit rev; - hash = "sha256:0vg2xzwc8q1sw20b26qbyd4flnws8668yhi1cg2h6z3jb3wamhr5"; + hash = "sha256:0c1pmg8y0yafdkliz970k52s92z3qin3xrz3g0n2ss7xcfbg8nzy"; } // { revCount = 0; shortRev = builtins.substring 0 7 rev; }; in { |