Skip to content

misc: nix/niv updates and typo updates #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ trim_trailing_whitespace = true
indent_style = space
indent_size = 4

[*.{json,md,nix,yml}]
[*.{json,md,nix,toml,yml}]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ jobs:
steps:
- uses: actions/checkout@v4
# Executes "typos ."
- uses: crate-ci/typos@v1.19.0
- uses: crate-ci/typos@v1.20.4
13 changes: 10 additions & 3 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@

[files]
extend-exclude = [
# "uefi/src/table/boot.rs"
# Generated sources
"uefi/src/proto/device_path/device_path_gen.rs"
]

[default]
extend-ignore-identifiers-re = [
# uefi-raw/src/protocol/device_path.rs
"PnP"
]

[default.extend-words]
# FOOBAR = "FOOBAR"
# ./uefi-test-runner/src/proto/device_path.rs:92:14
HD = "HD"

[default.extend-identifiers]
# FOOBAR = "FOOBAR"

14 changes: 7 additions & 7 deletions nix/sources.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"nixpkgs": {
"branch": "nixos-23.05",
"branch": "nixos-23.11",
"description": "Nix Packages collection",
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
"sha256": "1y12a4hgxx2lixrcbyhycwxvrrfik1lxjnwkprar0r6173rwy9ax",
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"sha256": "1shml3mf52smfra0x3mpfixddr4krp3n78fc2sv07ghiphn22k43",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/da4024d0ead5d7820f6bd15147d3fe2a0c0cec73.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"rust-overlay": {
Expand All @@ -17,10 +17,10 @@
"homepage": "",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e485313fc485700a9f1f9b8b272ddc0621d08357",
"sha256": "1v1gq022rnni6mm42pxmw6c5yy9il4jb2l92irh154ax616x2rzd",
"rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0",
"sha256": "1avinp5vcaicbjssmfwwfii5v8gab6ygh2hfmg4jli822469p5si",
"type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/e485313fc485700a9f1f9b8b272ddc0621d08357.tar.gz",
"url": "https://github.com/oxalica/rust-overlay/archive/ece8bdb3c3b58def25f204b9a1261dee55d7c9c0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}