about summary refs log tree commit diff
path: root/views/tvix (follow)
AgeCommit message (Collapse)AuthorFilesLines
2024-04-13 r/7908 fix(tvix): apply cbtemulator patch in tvix viewFlorian Klink1-1/+2
This tells josh to include the patch from third_party/overlays/patches/cbtemulator-uds.patch at nixpkgs/cbtemulator-uds.patch. We then use the `additionalOverlays` feature introduced earlier, and pass it an overlay adding the patch to `cbtemulator`. This only gets applied if tvix/shell.nix is not called with a pkgs argument, which is the case in the tvix view. Change-Id: I7bc5543460ddd30325ab0998e891c15fcaf8bcfe Reviewed-on: https://cl.tvl.fyi/c/depot/+/11408 Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: flokli <flokli@flokli.de>
2023-12-11 r/7148 fix(views/tvix): Canonicalise Tvix workspace formattingVincent Ambo1-3/+2
This change is done by josh on push back to Tvix, as the formatting of our workspace files differs from its canonical formatting. Change-Id: I97bf9d87f82b6acbe3350c1a3c99bd38b5af98e5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10251 Reviewed-by: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
2023-10-25 r/6878 chore(tvix): move buildkite.yml from views/tvix to tvix/Florian Klink1-9/+0
This should remove the ambiguity on where buildkite.yml should show up at least. We might still want to move workspace.josh into tvix/ too at some point, but that's blocked on https://github.com/josh-project/josh/issues/1287 This commit doesn't cause any change in views/tvix, with a previous version of this commit added to my HEAD, I ran josh-filter to verify it still points to ce0df88561fee8a4d6052ca9f2a1792f899a202a. Change-Id: Ic03e92260dc7725bc2fcf01b7c72a097d92c028e Reviewed-on: https://cl.tvl.fyi/c/depot/+/9828 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
2023-10-07 r/6722 fix(view/tvix): remove other default.nix filesFlorian Klink1-1/+2
These only work in depot usecases anyways. Change-Id: I463ffb4e3ac2d3a20db3cace749e357c893e7188 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9557 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
2023-10-07 r/6721 refactor(tvix,views/tvix): move shell into separate fileFlorian Klink2-27/+4
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-06-13 r/6285 fix(views/tvix): add fuse dependencies to external shell viewVincent Ambo1-9/+11
Change-Id: Ie7b8c5b983e5b41bffe0748d0047ffcfd82072e8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8759 Reviewed-by: flokli <flokli@flokli.de> Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
2023-03-02 r/5866 chore(3p/sources): Bump channels & overlayssterni1-13/+1
* //3p/sources: temporarily switch to nixos-unstable-small, since it includes: - evans update we are interested in, allowing us to drop our evans patches. - awscli2 update that unbreaks //users/grfn * //3p/overlays/tvl: - drop evans patches - update tdlib to 1.8.11 to make tazjin's emacs happy - drop obsolete mullvad workaround * //users/grfn/keyboard: disable -Werror for array-bounds warnings. Seems like a non-trivial job to resolve the warning properly, hopefully GCC 12 still generates the same working code as GCC 11 used to. * //users/grfn/system/home: remove yubikey-manager-qt. Yubico can't seem to keep that on pace with yubikey-manager. It requires a <5 version of the latter which is incompatible with the recently released cryptography >= 39. * //3p/gerrit: update changed FOD hash for the fetch step Change-Id: I590ab996247e69b0ab5059cd173840ef4ebfe939 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8133 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi>
2023-02-01 r/5814 feat(views/tvix): add buildkite pipelineFlorian Klink1-0/+9
Change-Id: Iabfc8c64012500a39aaafb3976ceb4a249387ee8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8002 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
2023-02-01 r/5811 feat(views/tvix): add tvix josh workspaceFlorian Klink2-0/+41
This provides a trimmed-down version of //tvix, that allows building tvix without all of the monorepo cloned. We need to manually vendor in our patch for evans and ``--bytes-as- base64`, as we don't have our depot overlays available in the josh workspace. Fixes https://b.tvl.fyi/issues/247. Change-Id: I24306b8bb16ebf0df238b8f1eee0d47655a14827 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8000 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI