Skip to content

Commit

Permalink
chore(3p/sources): Bump channels & overlays (2024-07-28)
Browse files Browse the repository at this point in the history
* Treewide: re-run depotfmt

* //third_party/nixpkgs:html5validator: build with Python 3.11,
  dependency openstackdocstheme doesn't support 3.12

* //users/sterni/machines/ingeborg: adapt to poorly handled fcgiwrap
  module API change: NixOS/nixpkgs#318599

* //tvix/*-go: regenerate protobuf files

* //third_party/nixpkgs:treefmt: Remove patch for merged pull request

* //users/flokli/ipu6-softisp: rebase, drop upstreamed kernel patches

Change-Id: Ie4e0df007c287e8cd6207683a9a25838aa5bd39a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11971
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
  • Loading branch information
glittershark authored and clbot committed Aug 1, 2024
1 parent 0749313 commit 2aaab90
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 82 deletions.
14 changes: 7 additions & 7 deletions build-go/build.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build-go/rpc_build.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions castore-go/castore.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions castore-go/rpc_blobstore.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions castore-go/rpc_directory.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions castore/src/directoryservice/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,16 @@ async fn put_get_foo(directory_service: impl DirectoryService) {
.await;

let valid_closures = [
vec![Ok(DIRECTORY_D.clone()), Ok(DIRECTORY_B.clone()), Ok(DIRECTORY_A.clone())],
vec![Ok(DIRECTORY_D.clone()), Ok(DIRECTORY_A.clone()), Ok(DIRECTORY_B.clone())]
vec![
Ok(DIRECTORY_D.clone()),
Ok(DIRECTORY_B.clone()),
Ok(DIRECTORY_A.clone()),
],
vec![
Ok(DIRECTORY_D.clone()),
Ok(DIRECTORY_A.clone()),
Ok(DIRECTORY_B.clone()),
],
];
if !valid_closures.contains(&retrieved_closure) {
panic!("invalid closure returned: {:?}", retrieved_closure);
Expand Down
2 changes: 1 addition & 1 deletion cli/tests/import.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ }: import ./six.nix { }
{}: import ./six.nix { }
2 changes: 1 addition & 1 deletion cli/tests/six.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ }: { six = builtins.foldl' (x: y: x + y) 0 [ 1 2 3 ]; }
{}: { six = builtins.foldl' (x: y: x + y) 0 [ 1 2 3 ]; }
12 changes: 5 additions & 7 deletions eval/src/chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,11 @@ impl Chunk {
write!(writer, "{:4}\t", line)?;
}

let a = |idx| {
match &self[idx] {
Value::Thunk(t) => t.debug_repr(),
Value::Closure(c) => format!("closure({:p})", c.lambda),
Value::Blueprint(b) => format!("blueprint({:p})", b),
val => format!("{}", val),
}
let a = |idx| match &self[idx] {
Value::Thunk(t) => t.debug_repr(),
Value::Closure(c) => format!("closure({:p})", c.lambda),
Value::Blueprint(b) => format!("blueprint({:p})", b),
val => format!("{}", val),
};

match self[idx] {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
builtins.pathExists ("/dev/null/.")
builtins.pathExists ("/dev/null/.")
Loading

0 comments on commit 2aaab90

Please sign in to comment.