build,ci: restore rust-toolchain.toml and update flakes to fix CI

This commit is contained in:
oxalica 2025-09-11 18:48:38 -04:00
parent 10c1ad5170
commit 5f7f383f11
4 changed files with 55 additions and 11 deletions

View file

@ -47,7 +47,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
# NB: Sync MSRV with Cargo.toml! # NB: Sync MSRV with Cargo.toml and rust-toolchain.toml!
rust: [stable, beta, "1.88"] rust: [stable, beta, "1.88"]
name: Test ${{ matrix.rust }} name: Test ${{ matrix.rust }}
# Need libsqlite3-dev >= 3.38.0 (2022-02-22) # Need libsqlite3-dev >= 3.38.0 (2022-02-22)

View file

@ -9,7 +9,7 @@ default-members = ["blahd"]
[workspace.package] [workspace.package]
edition = "2024" edition = "2024"
# NB: Sync MSRV with CI! # NB: Sync MSRV with CI and rust-toolchain.toml!
rust-version = "1.88" # let_chains rust-version = "1.88" # let_chains
[workspace.lints.clippy] [workspace.lints.clippy]

58
flake.lock generated
View file

@ -1,17 +1,40 @@
{ {
"nodes": { "nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"naersk",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1752475459,
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
"owner": "nix-community",
"repo": "fenix",
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"fenix": "fenix",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1739824009, "lastModified": 1752689277,
"narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "e5130d37369bfa600144c2424270c96f0ef0e11d", "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +45,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742288794, "lastModified": 1757487488,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,6 +66,23 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1752428706,
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -50,11 +90,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742351546, "lastModified": 1757558036,
"narHash": "sha256-GPubFcOXyi8TVm1xpltHYPcfGr+iO+if2u/EtzFVnHQ=", "narHash": "sha256-DyZaeaHy8iibckZ63XOqYJtEHc3kmVy8JrBIBV/GQHI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b0a7450168c62a46f87d204280e6d9d1c0292671", "rev": "b8adf899786b7b77b8c3636a9b753e3622f00db0",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
rust-toolchain.toml Normal file
View file

@ -0,0 +1,4 @@
[toolchain]
channel = "1.88" # NB: Sync MSRV with Cargo.toml and CI!
profile = "default"
components = ["llvm-tools"]