radrootsd

commit d8746dc976faf80047be5092210b85d8c33f451f
parent 92fadb81dc5a234a696889eeefe71ca0f8c3bb91
Author: triesap <tyson@radroots.org>
Date:   Mon,  7 Sep 2026 11:33:30 +0000

fix(nix): align radrootsd flake with immutable Lib input

Diffstat:
M
flake.lock
 | 
8
++++----
M
flake.nix
 | 
16
++++++----------
M
tests/package_boundary.rs
 | 
5
+++--

3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -45,17 +45,17 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1788739124,
-        "narHash": "sha256-Aw8qbU1DrtxSYJKg0js6kexnKgVGFCjR34bgq+ZVAVo=",
+        "lastModified": 1787209450,
+        "narHash": "sha256-9cm5/jyp5+/2KUCRdi4jynU1pYaX+23+LbXwVBiHfqs=",
         "owner": "radrootslabs",
         "repo": "lib",
-        "rev": "055096853fca95e15d0f813d33a14aca13be3881",
+        "rev": "3563f3b5a4331eb2cb3f925cafc9de524d844228",
         "type": "github"
       },
       "original": {
         "owner": "radrootslabs",
         "repo": "lib",
-        "rev": "055096853fca95e15d0f813d33a14aca13be3881",
+        "rev": "3563f3b5a4331eb2cb3f925cafc9de524d844228",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
@@ -8,7 +8,7 @@
     # that upstream fetch defect while preserving the same locked sources.
     crane.url = "github:ipetkov/crane/01bc1d404a51a0a07e9d8759cd50a7903e218c82";
     lib = {
-      url = "github:radrootslabs/lib/055096853fca95e15d0f813d33a14aca13be3881";
+      url = "github:radrootslabs/lib/3563f3b5a4331eb2cb3f925cafc9de524d844228";
       inputs.crane.follows = "crane";
     };
     nixpkgs.follows = "lib/nixpkgs";
@@ -24,7 +24,10 @@
       ...
     }:
     let
-      systems = lib.lib.supportedSystems;
+      systems = [
+        "aarch64-darwin"
+        "x86_64-linux"
+      ];
       forAllSystems =
         function:
         builtins.listToAttrs (
@@ -40,11 +43,7 @@
             inherit system;
             overlays = [ rust-overlay.overlays.default ];
           };
-          helpers = lib.lib.mkServiceHelpers system;
-          toolchain = helpers.mkToolchain {
-            rustToolchainFile = ./rust-toolchain.toml;
-          };
-          nativeInputs = helpers.mkNativeInputs { };
+          toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
           craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
           source = pkgs.lib.cleanSourceWith {
             src = ./.;
@@ -61,9 +60,6 @@
             src = source;
             cargoLock = ./Cargo.lock;
             strictDeps = true;
-            nativeBuildInputs = nativeInputs.nativeBuildInputs;
-            buildInputs = nativeInputs.buildInputs;
-            env = nativeInputs.environment;
             doCheck = false;
           };
           cargoArtifacts = craneLib.buildDepsOnly commonArgs;
diff --git a/tests/package_boundary.rs b/tests/package_boundary.rs
@@ -34,8 +34,9 @@ fn public_error_is_redacted_and_source_free() {
 #[test]
 fn nix_outputs_are_real_owned_and_exactly_bounded() {
     for required in [
-        "github:radrootslabs/lib/055096853fca95e15d0f813d33a14aca13be3881",
-        "systems = lib.lib.supportedSystems",
+        "github:radrootslabs/lib/3563f3b5a4331eb2cb3f925cafc9de524d844228",
+        "\"aarch64-darwin\"",
+        "\"x86_64-linux\"",
         "craneLib.buildPackage",
         "craneLib.mkCargoDerivation",
         "program = \"${package}/bin/radrootsd\"",