Skip to content

Commit 80dac52

Browse files
authored
[nix flake] don't download mgd OpenAPI docs (#7560)
It appears that downloading the `ddm-admin.json` and `mg-admin.json` OpenAPI documents from the Maghemite repo is no longer part of the normal dev environment setup, as Omicron now depends on the Progenitor clients for Maghemite's HTTP APIs via a [Cargo git dep][1]. The `cargo xtask download` command does not have commands to download the Maghemite OpenAPI spec, just the actual `mgd` binary. Therefore, I've removed them from the Nix flake, as well, since they're not necessary to build Omicron. This is particularly important as the `tools/maghemite_mg_openapi_version` and `tools/maghemite_ddm_openapi_version` no longer contain the SHA of the file downloaded from Buildomat as of commit 31da03c, so Nix no longer likes them. Since they're not actually required, I've fixed the problem by just removing them from the dev flake. [1]: https://github.com/oxidecomputer/omicron/blob/18e317b1eb5bfbbbe9c11b86b4f7b7c76fd70528/Cargo.toml#L469-L470
1 parent cd96bb4 commit 80dac52

File tree

2 files changed

+6
-23
lines changed

2 files changed

+6
-23
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,13 @@
8080
mgVersion = openAPIVersion
8181
./tools/maghemite_mg_openapi_version;
8282

83-
8483
dendriteOpenAPI = downloadOpenAPI
8584
{
8685
repo = "dendrite";
8786
file = "dpd.json";
8887
version = dendriteVersion;
8988
};
9089

91-
ddmOpenAPI = downloadOpenAPI
92-
{
93-
repo = "maghemite";
94-
file = "ddm-admin.json";
95-
version = openAPIVersion ./tools/maghemite_ddm_openapi_version;
96-
};
97-
98-
mgOpenAPI = downloadOpenAPI
99-
{
100-
repo = "maghemite";
101-
file = "mg-admin.json";
102-
version = mgVersion;
103-
};
10490

10591
# given a list of strings of the form `PREFIX="SHA256"`, finds the string
10692
# starting with the provided `name` and returns the hash for that prefix.
@@ -409,9 +395,6 @@
409395
LIBCLANG_PATH = "${libclang.lib}/lib";
410396
OPENSSL_DIR = "${openssl.dev}";
411397
OPENSSL_LIB_DIR = "${openssl.out}/lib";
412-
413-
MG_OPENAPI_PATH = mgOpenAPI;
414-
DDM_OPENAPI_PATH = ddmOpenAPI;
415398
DPD_OPENAPI_PATH = dendriteOpenAPI;
416399

417400
# Needed by rustfmt-wrapper, see:

0 commit comments

Comments
 (0)