Skip to content

Commit d7fcef3

Browse files
afq984Chromeos LUCI
afq984
authored and
Chromeos LUCI
committed
Upgrade nix to 0.28.0
This gives us file descriptor types. nix-rust/nix#1863 BUG=b:233174528 TEST=CQ Change-Id: Ida81204a41d9e2f8b81afa3d0eb729e81a853f95 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5599982 Tested-by: [email protected] <[email protected]> Commit-Queue: Li-Yu Yu <[email protected]> Reviewed-by: Chih-Yang Hsia <[email protected]>
1 parent 73b9bd2 commit d7fcef3

File tree

10 files changed

+132
-261
lines changed

10 files changed

+132
-261
lines changed

‎Cargo.Bazel.lock

+79-212
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "fdcdf676d9bf2c46b288464c42c31a70f882f1339f47050290cd212d93893218",
2+
"checksum": "b2310187ef1f7403122a658237ada76b63171f32fc13a2075dad28a0efae81fe",
33
"crates": {
44
"addr2line 0.20.0": {
55
"name": "addr2line",
@@ -672,7 +672,7 @@
672672
"target": "log"
673673
},
674674
{
675-
"id": "nix 0.26.2",
675+
"id": "nix 0.28.0",
676676
"target": "nix"
677677
},
678678
{
@@ -1337,6 +1337,44 @@
13371337
],
13381338
"license_file": "LICENSE-APACHE"
13391339
},
1340+
"cfg_aliases 0.1.1": {
1341+
"name": "cfg_aliases",
1342+
"version": "0.1.1",
1343+
"package_url": "https://github.com/katharostech/cfg_aliases",
1344+
"repository": {
1345+
"Http": {
1346+
"url": "https://static.crates.io/crates/cfg_aliases/0.1.1/download",
1347+
"sha256": "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
1348+
}
1349+
},
1350+
"targets": [
1351+
{
1352+
"Library": {
1353+
"crate_name": "cfg_aliases",
1354+
"crate_root": "src/lib.rs",
1355+
"srcs": {
1356+
"allow_empty": false,
1357+
"include": [
1358+
"**/*.rs"
1359+
]
1360+
}
1361+
}
1362+
}
1363+
],
1364+
"library_target_name": "cfg_aliases",
1365+
"common_attrs": {
1366+
"compile_data_glob": [
1367+
"**"
1368+
],
1369+
"edition": "2018",
1370+
"version": "0.1.1"
1371+
},
1372+
"license": "MIT",
1373+
"license_ids": [
1374+
"MIT"
1375+
],
1376+
"license_file": "LICENSE"
1377+
},
13401378
"clang-sys 1.6.1": {
13411379
"name": "clang-sys",
13421380
"version": "1.6.1",
@@ -2027,7 +2065,7 @@
20272065
"target": "log"
20282066
},
20292067
{
2030-
"id": "nix 0.26.2",
2068+
"id": "nix 0.28.0",
20312069
"target": "nix"
20322070
},
20332071
{
@@ -4859,85 +4897,6 @@
48594897
],
48604898
"license_file": "LICENSE-MIT"
48614899
},
4862-
"memoffset 0.7.1": {
4863-
"name": "memoffset",
4864-
"version": "0.7.1",
4865-
"package_url": "https://github.com/Gilnaa/memoffset",
4866-
"repository": {
4867-
"Http": {
4868-
"url": "https://static.crates.io/crates/memoffset/0.7.1/download",
4869-
"sha256": "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
4870-
}
4871-
},
4872-
"targets": [
4873-
{
4874-
"Library": {
4875-
"crate_name": "memoffset",
4876-
"crate_root": "src/lib.rs",
4877-
"srcs": {
4878-
"allow_empty": false,
4879-
"include": [
4880-
"**/*.rs"
4881-
]
4882-
}
4883-
}
4884-
},
4885-
{
4886-
"BuildScript": {
4887-
"crate_name": "build_script_build",
4888-
"crate_root": "build.rs",
4889-
"srcs": {
4890-
"allow_empty": false,
4891-
"include": [
4892-
"**/*.rs"
4893-
]
4894-
}
4895-
}
4896-
}
4897-
],
4898-
"library_target_name": "memoffset",
4899-
"common_attrs": {
4900-
"compile_data_glob": [
4901-
"**"
4902-
],
4903-
"crate_features": {
4904-
"common": [
4905-
"default"
4906-
],
4907-
"selects": {}
4908-
},
4909-
"deps": {
4910-
"common": [
4911-
{
4912-
"id": "memoffset 0.7.1",
4913-
"target": "build_script_build"
4914-
}
4915-
],
4916-
"selects": {}
4917-
},
4918-
"edition": "2015",
4919-
"version": "0.7.1"
4920-
},
4921-
"build_script_attrs": {
4922-
"data_glob": [
4923-
"**"
4924-
],
4925-
"deps": {
4926-
"common": [
4927-
{
4928-
"id": "autocfg 1.1.0",
4929-
"target": "autocfg"
4930-
}
4931-
],
4932-
"selects": {}
4933-
}
4934-
},
4935-
"license": "MIT",
4936-
"license_ids": [
4937-
"MIT"
4938-
],
4939-
"license_file": "LICENSE"
4940-
},
49414900
"minimal-lexical 0.2.1": {
49424901
"name": "minimal-lexical",
49434902
"version": "0.2.1",
@@ -5105,14 +5064,14 @@
51055064
],
51065065
"license_file": "LICENSE"
51075066
},
5108-
"nix 0.26.2": {
5067+
"nix 0.28.0": {
51095068
"name": "nix",
5110-
"version": "0.26.2",
5069+
"version": "0.28.0",
51115070
"package_url": "https://github.com/nix-rust/nix",
51125071
"repository": {
51135072
"Http": {
5114-
"url": "https://static.crates.io/crates/nix/0.26.2/download",
5115-
"sha256": "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
5073+
"url": "https://static.crates.io/crates/nix/0.28.0/download",
5074+
"sha256": "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
51165075
}
51175076
},
51185077
"targets": [
@@ -5127,6 +5086,18 @@
51275086
]
51285087
}
51295088
}
5089+
},
5090+
{
5091+
"BuildScript": {
5092+
"crate_name": "build_script_build",
5093+
"crate_root": "build.rs",
5094+
"srcs": {
5095+
"allow_empty": false,
5096+
"include": [
5097+
"**/*.rs"
5098+
]
5099+
}
5100+
}
51305101
}
51315102
],
51325103
"library_target_name": "nix",
@@ -5136,48 +5107,16 @@
51365107
],
51375108
"crate_features": {
51385109
"common": [
5139-
"acct",
5140-
"aio",
51415110
"default",
5142-
"dir",
5143-
"env",
5144-
"event",
5145-
"feature",
5146-
"fs",
5147-
"hostname",
5148-
"inotify",
5149-
"ioctl",
5150-
"kmod",
5151-
"memoffset",
5152-
"mman",
5153-
"mount",
5154-
"mqueue",
5155-
"net",
5156-
"personality",
5157-
"pin-utils",
5158-
"poll",
51595111
"process",
5160-
"pthread",
5161-
"ptrace",
5162-
"quota",
5163-
"reboot",
5164-
"resource",
5165-
"sched",
5166-
"signal",
5167-
"socket",
5168-
"term",
5169-
"time",
5170-
"ucontext",
5171-
"uio",
5172-
"user",
5173-
"zerocopy"
5112+
"resource"
51745113
],
51755114
"selects": {}
51765115
},
51775116
"deps": {
51785117
"common": [
51795118
{
5180-
"id": "bitflags 1.3.2",
5119+
"id": "bitflags 2.4.0",
51815120
"target": "bitflags"
51825121
},
51835122
{
@@ -5189,25 +5128,28 @@
51895128
"target": "libc"
51905129
},
51915130
{
5192-
"id": "pin-utils 0.1.0",
5193-
"target": "pin_utils"
5194-
},
5195-
{
5196-
"id": "static_assertions 1.1.0",
5197-
"target": "static_assertions"
5131+
"id": "nix 0.28.0",
5132+
"target": "build_script_build"
51985133
}
51995134
],
5200-
"selects": {
5201-
"cfg(not(target_os = \"redox\"))": [
5202-
{
5203-
"id": "memoffset 0.7.1",
5204-
"target": "memoffset"
5205-
}
5206-
]
5207-
}
5135+
"selects": {}
52085136
},
5209-
"edition": "2018",
5210-
"version": "0.26.2"
5137+
"edition": "2021",
5138+
"version": "0.28.0"
5139+
},
5140+
"build_script_attrs": {
5141+
"data_glob": [
5142+
"**"
5143+
],
5144+
"deps": {
5145+
"common": [
5146+
{
5147+
"id": "cfg_aliases 0.1.1",
5148+
"target": "cfg_aliases"
5149+
}
5150+
],
5151+
"selects": {}
5152+
}
52115153
},
52125154
"license": "MIT",
52135155
"license_ids": [
@@ -7637,45 +7579,6 @@
76377579
],
76387580
"license_file": "LICENSE-APACHE"
76397581
},
7640-
"static_assertions 1.1.0": {
7641-
"name": "static_assertions",
7642-
"version": "1.1.0",
7643-
"package_url": "https://github.com/nvzqz/static-assertions-rs",
7644-
"repository": {
7645-
"Http": {
7646-
"url": "https://static.crates.io/crates/static_assertions/1.1.0/download",
7647-
"sha256": "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
7648-
}
7649-
},
7650-
"targets": [
7651-
{
7652-
"Library": {
7653-
"crate_name": "static_assertions",
7654-
"crate_root": "src/lib.rs",
7655-
"srcs": {
7656-
"allow_empty": false,
7657-
"include": [
7658-
"**/*.rs"
7659-
]
7660-
}
7661-
}
7662-
}
7663-
],
7664-
"library_target_name": "static_assertions",
7665-
"common_attrs": {
7666-
"compile_data_glob": [
7667-
"**"
7668-
],
7669-
"edition": "2015",
7670-
"version": "1.1.0"
7671-
},
7672-
"license": "MIT OR Apache-2.0",
7673-
"license_ids": [
7674-
"Apache-2.0",
7675-
"MIT"
7676-
],
7677-
"license_file": "LICENSE-APACHE"
7678-
},
76797582
"strength_reduce 0.2.4": {
76807583
"name": "strength_reduce",
76817584
"version": "0.2.4",
@@ -11239,42 +11142,6 @@
1123911142
"x86_64-unknown-nixos-gnu",
1124011143
"x86_64-unknown-none"
1124111144
],
11242-
"cfg(not(target_os = \"redox\"))": [
11243-
"aarch64-apple-darwin",
11244-
"aarch64-apple-ios",
11245-
"aarch64-apple-ios-sim",
11246-
"aarch64-fuchsia",
11247-
"aarch64-linux-android",
11248-
"aarch64-pc-windows-msvc",
11249-
"aarch64-unknown-linux-gnu",
11250-
"aarch64-unknown-nixos-gnu",
11251-
"aarch64-unknown-nto-qnx710",
11252-
"arm-unknown-linux-gnueabi",
11253-
"armv7-linux-androideabi",
11254-
"armv7-unknown-linux-gnueabi",
11255-
"i686-apple-darwin",
11256-
"i686-linux-android",
11257-
"i686-pc-windows-msvc",
11258-
"i686-unknown-freebsd",
11259-
"i686-unknown-linux-gnu",
11260-
"powerpc-unknown-linux-gnu",
11261-
"riscv32imc-unknown-none-elf",
11262-
"riscv64gc-unknown-none-elf",
11263-
"s390x-unknown-linux-gnu",
11264-
"thumbv7em-none-eabi",
11265-
"thumbv8m.main-none-eabi",
11266-
"wasm32-unknown-unknown",
11267-
"wasm32-wasi",
11268-
"x86_64-apple-darwin",
11269-
"x86_64-apple-ios",
11270-
"x86_64-fuchsia",
11271-
"x86_64-linux-android",
11272-
"x86_64-pc-windows-msvc",
11273-
"x86_64-unknown-freebsd",
11274-
"x86_64-unknown-linux-gnu",
11275-
"x86_64-unknown-nixos-gnu",
11276-
"x86_64-unknown-none"
11277-
],
1127811145
"cfg(not(windows))": [
1127911146
"aarch64-apple-darwin",
1128011147
"aarch64-apple-ios",
@@ -11471,7 +11338,7 @@
1147111338
"itertools 0.11.0",
1147211339
"libc 0.2.153",
1147311340
"log 0.4.20",
11474-
"nix 0.26.2",
11341+
"nix 0.28.0",
1147511342
"once_cell 1.17.0",
1147611343
"openssl 0.10.62",
1147711344
"protobuf 3.2.0",

0 commit comments

Comments
 (0)