Skip to content

2026-03-24 flake update#2041

Merged
palfrey merged 51 commits intoTraceMachina:mainfrom
palfrey:flake-update-2025-11-11
Mar 30, 2026
Merged

2026-03-24 flake update#2041
palfrey merged 51 commits intoTraceMachina:mainfrom
palfrey:flake-update-2025-11-11

Conversation

@palfrey
Copy link
Copy Markdown
Member

@palfrey palfrey commented Nov 11, 2025

Description

Bring all the nixpkgs up-to-date, as we were running things ~1 year old, and it blocks a variety of security fixes due to needing a more recent Rust version. This PR brings us up to 1.93.1.

It also contains

  • A bunch of minor Rust changes that clippy now complains about. Some are "this was always a bit bad" and some are "newer Rust now supports a better syntax"
  • A few things that are "nixpkgs upgraded, so we need to fix things". So, playwright upgrade, disabling gci because it's broken now, working around a renovate issue on Macs
  • A lot of Bazel rule upgrades

Type of change

Please delete options that aren't relevant.

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

CI, bazel test //...

Checklist

  • Updated documentation if needed
  • Tests added/amended
  • bazel test //... passes locally
  • PR is contained in a single commit, using git amend see some docs

This change is Reviewable

Comment thread flake.nix
pkgs.gnutar
pkgs.gzip
pkgs.python3Full
pkgs.python3
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread flake.nix Outdated
[p.cacert]
++ pkgs.lib.optionals p.stdenv.targetPlatform.isDarwin [
p.darwin.apple_sdk.frameworks.Security
p.apple-sdk.frameworks.Security
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@palfrey
Copy link
Copy Markdown
Member Author

palfrey commented Mar 2, 2026

Mac issues are because of NixOS/nixpkgs#487193

@palfrey palfrey mentioned this pull request Mar 19, 2026
1 task
@palfrey palfrey mentioned this pull request Mar 25, 2026
5 tasks
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-enabled the local part of this so I could check I wasn't breaking it, because I did repeatedly during this PR

}
if let Some(key_value) = fields.get(field)
&& *key_value == Value::BulkString(value.as_bytes().to_vec())
{
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of the code changes are due to newer rust letting you merge an if let and other if expression as one line now, and clippy complaining if you don't

CLIENT_OPERATION_ID.into(),
worker_awaited_action.action_info().clone(),
Duration::from_secs(60),
Duration::from_mins(1),
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, newer clippy complaint

})?;
stores.insert(
config.instance_name.to_string(),
config.instance_name.clone(),
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clippy complains about these, probably because it's better to be explicit that this requires a clone v.s. looking like a possibly cheaper operation. To be clear, it's not doing anything different, it's just clearer.

const ACCOUNT_KEY_ENV_VAR: &str = "AZURE_STORAGE_KEY";

enum BufferedBodyState {
pub(crate) enum BufferedBodyState {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were private but used by something pub(crate) which was bad.

name: Coverage
runs-on: xlarge-ubuntu-24.04
timeout-minutes: 45
timeout-minutes: 180
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not needed anymore as this was actually a build problem, but nice to have just in case

sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
else
echo "Nothing to do here."
fi
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Breaks with new MacOS sometimes

Comment thread .bazelrc
build --@rules_rust//:clippy_flag=-Dclippy::todo
build --@rules_rust//:clippy_flag=-Aclippy::too_long_first_doc_paragraph
build --@rules_rust//:clippy_flag=-Dclippy::unchecked_duration_subtraction
build --@rules_rust//:clippy_flag=-Dclippy::unchecked_time_subtraction
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream renamed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants