Update dependencies (#858)

* flake.lock: Update, exclude Nixpkgs

Updating Nixpkgs seems to break the Nix build somehow (even though we
don't use the Nix input except for its `binaryTarball` job...).

Flake lock file updates:

• Updated input 'fenix':
    'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1727%2Brev-66fc1883c34c42df188b83272445aedb26bb64b5/018cc416-f0ae-724d-989f-aa4ded05d885/source.tar.gz?narHash=sha256-Vti1mv4WhmXHPNcFgUiJyt4OKLvsvLzM2eKS4bEegf0%3D' (2024-01-01)
  → 'https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1762%2Brev-668102037129923cd0fc239d864fce71eabdc6a3/018d63bb-6455-7a2f-98c6-74a36b8216a4/source.tar.gz?narHash=sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8%3D' (2024-02-01)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/cf52c4b2b3367ae7355ef23393e2eae1d37de723' (2023-12-31)
  → 'github:rust-lang/rust-analyzer/42cb1a2bd79af321b0cc503d2960b73f34e2f92b' (2024-01-31)
• Updated input 'nix/libgit2':
    'github:libgit2/libgit2/8fd4f83e8acf5ee813191f08c3433e77200ea38b' (2024-02-22)
  → 'github:libgit2/libgit2/45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5' (2023-10-18)

* Cargo.lock: update

* fixup: indexmap deprecation warnings

* Cargo.toml: bump strum to 0.26.1, which to 6.0.0

* CONTRIBUTING: update with more specific commands
This commit is contained in:
Cole Helbling 2024-02-23 09:27:43 -08:00 committed by GitHub
parent 40740423ca
commit bb665028de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 223 additions and 204 deletions

View file

@ -365,9 +365,9 @@ This package uses [Semantic Versioning](https://semver.org/). When determining t
To cut a release: To cut a release:
* Ensure the `flake.lock`, `Cargo.lock`, and Rust dependencies are up-to-date with the following: * Ensure the `flake.lock`, `Cargo.lock`, and Rust dependencies are up-to-date with the following:
+ `nix flake update` + `nix flake update --commit-lock-file`
+ `cargo update` + `cargo outdated --ignore-external-rel --aggressive`
+ `cargo outdated` + `cargo update --aggressive`
+ Make a PR for for this and let it get merged separately + Make a PR for for this and let it get merged separately
* Create a release branch from `main` (`git checkout -b release-v0.0.1`) * Create a release branch from `main` (`git checkout -b release-v0.0.1`)
* Remove the `-unreleased` from the `version` field in `Cargo.toml`, `flake.nix`, and the fixture JSON files * Remove the `-unreleased` from the `version` field in `Cargo.toml`, `flake.nix`, and the fixture JSON files

391
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -55,9 +55,9 @@ term = { version = "0.7.0", default-features = false }
uuid = { version = "1.2.2", features = ["serde"] } uuid = { version = "1.2.2", features = ["serde"] }
os-release = { version = "0.1.0", default-features = false } os-release = { version = "0.1.0", default-features = false }
is_ci = { version = "1.1.1", default-features = false, optional = true } is_ci = { version = "1.1.1", default-features = false, optional = true }
strum = { version = "0.25.0", features = ["derive"] } strum = { version = "0.26.1", features = ["derive"] }
nix-config-parser = { version = "0.2", features = ["serde"] } nix-config-parser = { version = "0.2", features = ["serde"] }
which = "5.0.0" which = "6.0.0"
sysctl = "0.5.4" sysctl = "0.5.4"
walkdir = "2.3.3" walkdir = "2.3.3"
indexmap = { version = "2.0.2", features = ["serde"] } indexmap = { version = "2.0.2", features = ["serde"] }

View file

@ -8,12 +8,12 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1704090261, "lastModified": 1706768574,
"narHash": "sha256-Vti1mv4WhmXHPNcFgUiJyt4OKLvsvLzM2eKS4bEegf0=", "narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=",
"rev": "66fc1883c34c42df188b83272445aedb26bb64b5", "rev": "668102037129923cd0fc239d864fce71eabdc6a3",
"revCount": 1727, "revCount": 1762,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1727%2Brev-66fc1883c34c42df188b83272445aedb26bb64b5/018cc416-f0ae-724d-989f-aa4ded05d885/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1762%2Brev-668102037129923cd0fc239d864fce71eabdc6a3/018d63bb-6455-7a2f-98c6-74a36b8216a4/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -53,11 +53,11 @@
"libgit2": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708609159, "lastModified": 1697646580,
"narHash": "sha256-sx2/FTDfM/wctWV8zFuliIc7YGzHghtmhqcvmYQVKnc=", "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
"owner": "libgit2", "owner": "libgit2",
"repo": "libgit2", "repo": "libgit2",
"rev": "8fd4f83e8acf5ee813191f08c3433e77200ea38b", "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1704034202, "lastModified": 1706735270,
"narHash": "sha256-OFBXLWm+aIqG+jNAz8BmB+QpepI11SGLtSY6qEs6EmY=", "narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "cf52c4b2b3367ae7355ef23393e2eae1d37de723", "rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -369,7 +369,7 @@ impl Action for CreateOrMergeNixConfig {
new_config.push_str(name); new_config.push_str(name);
new_config.push_str(" = "); new_config.push_str(" = ");
if let Some(merged_value) = merged_nix_config.settings_mut().remove(name) { if let Some(merged_value) = merged_nix_config.settings_mut().swap_remove(name) {
new_config.push_str(&merged_value); new_config.push_str(&merged_value);
new_config.push(' '); new_config.push(' ');
} else { } else {
@ -390,7 +390,7 @@ impl Action for CreateOrMergeNixConfig {
}; };
if let Some(to_remove) = to_remove { if let Some(to_remove) = to_remove {
existing_nix_config.settings_mut().remove(&to_remove); existing_nix_config.settings_mut().swap_remove(&to_remove);
} }
} }