Skip to content

Commit 1379320

Browse files
Merge pull request #1125 from phip1611/misc
misc: nix/niv updates and typo updates
2 parents 0c9a1df + 24ec6cd commit 1379320

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ trim_trailing_whitespace = true
1212
indent_style = space
1313
indent_size = 4
1414

15-
[*.{json,md,nix,yml}]
15+
[*.{json,md,nix,toml,yml}]
1616
indent_style = space
1717
indent_size = 2

.github/workflows/qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
steps:
88
- uses: actions/checkout@v4
99
# Executes "typos ."
10-
- uses: crate-ci/typos@v1.19.0
10+
- uses: crate-ci/typos@v1.20.4

.typos.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@
22

33
[files]
44
extend-exclude = [
5-
# "uefi/src/table/boot.rs"
5+
# Generated sources
6+
"uefi/src/proto/device_path/device_path_gen.rs"
7+
]
8+
9+
[default]
10+
extend-ignore-identifiers-re = [
11+
# uefi-raw/src/protocol/device_path.rs
12+
"PnP"
613
]
714

815
[default.extend-words]
9-
# FOOBAR = "FOOBAR"
16+
# ./uefi-test-runner/src/proto/device_path.rs:92:14
17+
HD = "HD"
1018

1119
[default.extend-identifiers]
12-
# FOOBAR = "FOOBAR"
1320

nix/sources.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"nixpkgs": {
3-
"branch": "nixos-23.05",
3+
"branch": "nixos-23.11",
44
"description": "Nix Packages collection",
55
"homepage": null,
66
"owner": "NixOS",
77
"repo": "nixpkgs",
8-
"rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
9-
"sha256": "1y12a4hgxx2lixrcbyhycwxvrrfik1lxjnwkprar0r6173rwy9ax",
8+
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
9+
"sha256": "1shml3mf52smfra0x3mpfixddr4krp3n78fc2sv07ghiphn22k43",
1010
"type": "tarball",
11-
"url": "https://github.com/NixOS/nixpkgs/archive/da4024d0ead5d7820f6bd15147d3fe2a0c0cec73.tar.gz",
11+
"url": "https://github.com/NixOS/nixpkgs/archive/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"rust-overlay": {
@@ -17,10 +17,10 @@
1717
"homepage": "",
1818
"owner": "oxalica",
1919
"repo": "rust-overlay",
20-
"rev": "e485313fc485700a9f1f9b8b272ddc0621d08357",
21-
"sha256": "1v1gq022rnni6mm42pxmw6c5yy9il4jb2l92irh154ax616x2rzd",
20+
"rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0",
21+
"sha256": "1avinp5vcaicbjssmfwwfii5v8gab6ygh2hfmg4jli822469p5si",
2222
"type": "tarball",
23-
"url": "https://github.com/oxalica/rust-overlay/archive/e485313fc485700a9f1f9b8b272ddc0621d08357.tar.gz",
23+
"url": "https://github.com/oxalica/rust-overlay/archive/ece8bdb3c3b58def25f204b9a1261dee55d7c9c0.tar.gz",
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
}
2626
}

0 commit comments

Comments
 (0)