mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/views
History
Florian Klink 03fec0b393 refactor(tvix,views/tvix): move shell into separate file 
So far, we provided a custom `default.nix` in the root of the tvix josh
workspace, which re-defined the shell attribute from `tvix/default.nix`.
Some of the recent fixes, e.g. the MacOS-specific additions to the list
of dependencies however didn't get ported over to this file, and in
general, it's quite annoying to have two different places for these
things.

Initially I explored the idea of moving this default.nix file to a
default-depot.nix file in the josh worktree only, and then "polyfill"
some of the dependencies, or set up readTree in the josh workspace too,
but it turned out to pull in too many dependencies to be worth
the effort (nix.sparseTree, tools.depotfmt, crate2nix overlay,
third_party.gitignoreSource).

I now took a different approach - moving the definition of the `shell`
attribute from `tvix/default.nix` to its own `shell.nix` file, which is
imported from `tvix/default.nix` in regular depot usecases.

Josh workspace consumers only see the `shell.nix`, which can be used
in a self-contained fashion, the other `default.nix` is gone entirely,
and we update the workspace file to also not show `tvix/default.nix` at
the root either, so running `nix-shell` and then `cargo build` should
still work.

Change-Id: I6cb54d45d150c597612530ba44bc578f9d7f9120
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9556
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
2023-10-07 05:47:31 +00:00
..
kit fix(views/kit): provide lib argument to lazy-deps 2023-06-11 17:05:56 +00:00
tvix refactor(tvix,views/tvix): move shell into separate file 2023-10-07 05:47:31 +00:00
.skip-subtree feat(kit): Export TVL kit as a josh workspace 2022-01-19 10:24:55 +00:00
default.nix fix(views/kit): communicate :unsign in the tvl-kit URL directly 2023-03-31 08:46:01 +00:00
README.md fix(views/kit): communicate :unsign in the tvl-kit URL directly 2023-03-31 08:46:01 +00:00

README.md

depot views

This folder contains external views of depot content, defined using josh workspaces. See the individual views for a description of their individual content and usage information.

Testing changes locally

Generally, when iterating on these files, it's best to locally invoke josh- filter (from //third_party//josh) locally to inspect how the workspace would look like:

  • Commit your changes. This is required, as josh-filter operates on your HEAD, not working directory state.
  • Invoke josh-filter with the filter expression, for example josh-filter ':workspace=views/tvix'.
  • Peek at the synthesized git history by looking at FILTERED_HEAD.

Testing changes in Gerrit

It's also possible to clone resulting workspaces for CLs that were already pushed to Gerrit, but didn't land in master yet.

For CL1234 at revision 2, the URL passed to git clone would look like this:

https://code.tvl.fyi/depot.git@refs/changes/32/1234/2:workspace=views/kit.git