commit bf092bea383606f417dac13bfc5b147204e0482e
parent 5e3e7bf3b0cacd5b7302fe642c3fcb49b163ffb2
Author: triesap <tyson@radroots.org>
Date: Fri, 16 Oct 2026 06:17:38 +0000
nix: acquire Rust 1.99 for current service helpers
- Pin the verified Rust overlay through a Nix-generated lock update.
- Align OCI compiler admission, fixture metadata and label checks.
- Preserve other inputs and reject obsolete compiler metadata.
- Build 14 Linux fixture checks and evaluate both system definitions.
Diffstat:
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/build/nix/service/fixture.nix b/build/nix/service/fixture.nix
@@ -45,7 +45,7 @@ let
serviceVersion = "0.1.0-alpha";
serviceCommit = "1111111111111111111111111111111111111111";
libRevision = "2222222222222222222222222222222222222222";
- rustVersion = "1.97.1";
+ rustVersion = "1.99.0";
target = pkgs.stdenv.hostPlatform.rust.rustcTarget;
featureProfile = "service-host";
contractVersions = {
@@ -96,7 +96,7 @@ let
.config.Labels == {
"dev.radroots.build.feature-profile": "service-host",
"dev.radroots.build.lib-revision": "2222222222222222222222222222222222222222",
- "dev.radroots.build.rust-version": "1.97.1",
+ "dev.radroots.build.rust-version": "1.99.0",
"dev.radroots.build.target": "${pkgs.stdenv.hostPlatform.rust.rustcTarget}",
"dev.radroots.contract.admin-version": "3",
"dev.radroots.contract.config-version": "1",
@@ -738,6 +738,16 @@ let
ociArgs
// {
buildInfo = fixtureBuildInfo // {
+ rustVersion = "1.97.1";
+ };
+ }
+ )).outPath
+ ))
+ (builtins.tryEval (
+ (service.mkServiceOciImage (
+ ociArgs
+ // {
+ buildInfo = fixtureBuildInfo // {
target = "x86_64-unknown-linux-musl";
};
}
diff --git a/build/nix/service/oci.nix b/build/nix/service/oci.nix
@@ -9,8 +9,7 @@
buildInfo,
}:
assert lib.assertMsg pkgs.stdenv.isLinux "service OCI images require a Linux builder";
-assert lib.assertMsg (
- pkgs.stdenv.hostPlatform.isx86_64
+assert lib.assertMsg (pkgs.stdenv.hostPlatform.isx86_64
) "service OCI images support only x86_64-linux";
assert lib.assertMsg (
builtins.isString serviceName
@@ -55,7 +54,7 @@ assert lib.assertMsg (
&& builtins.match "^[0-9a-f]{40}$" buildInfo.libRevision != null
) "buildInfo.libRevision must be a full lowercase Git revision";
assert lib.assertMsg (
- buildInfo.rustVersion == "1.97.1"
+ buildInfo.rustVersion == "1.99.0"
) "buildInfo.rustVersion must match the governed Rust toolchain";
assert lib.assertMsg (
buildInfo.target == pkgs.stdenv.hostPlatform.rust.rustcTarget
diff --git a/flake.lock b/flake.lock
@@ -80,16 +80,17 @@
]
},
"locked": {
- "lastModified": 1785131767,
- "narHash": "sha256-VNbQv2P0zgaNh96mT4LrnX7hdXgiC5nBH+uvyrrVX7U=",
+ "lastModified": 1792087235,
+ "narHash": "sha256-vQHkG9lwSHJI3MVnyilP50hWW3TNnBWFTbLIurWgPhI=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "c67ce00525464a710971351c183ce67acb6ca827",
+ "rev": "87ffb7f777aef2e2647fd8fd718a5b3cbc825588",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
+ "rev": "87ffb7f777aef2e2647fd8fd718a5b3cbc825588",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
@@ -6,7 +6,7 @@
flake-parts.url = "github:hercules-ci/flake-parts";
crane.url = "github:ipetkov/crane";
rust-overlay = {
- url = "github:oxalica/rust-overlay";
+ url = "github:oxalica/rust-overlay/87ffb7f777aef2e2647fd8fd718a5b3cbc825588";
inputs.nixpkgs.follows = "nixpkgs";
};
treefmt-nix = {