refactor(nix): Manual autowiring, done uniformly

Also removes the nix-health package. Manual impl until juspay/rust-flake#23
juspay · Sep 3, 2024 · 3542267 · 3542267
1 parent 4524a22
commit 3542267
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/crates/nix_health/crate.nix b/crates/nix_health/crate.nix
@@ -9,7 +9,6 @@ let
   inherit (flake) inputs;
 in
 {
-  autoWire = true;
   crane = {
     args = {
       buildInputs = lib.optionals pkgs.stdenv.isDarwin (

diff --git a/crates/nix_rs/crate.nix b/crates/nix_rs/crate.nix
@@ -9,7 +9,6 @@ let
   inherit (flake) inputs;
 in
 {
-  autoWire = true;
   crane = {
     args = {
       buildInputs = lib.optionals pkgs.stdenv.isDarwin (

diff --git a/crates/nixci/crate.nix b/crates/nixci/crate.nix
@@ -9,7 +9,6 @@ let
   inherit (flake) inputs;
 in
 {
-  autoWire = true;
   crane = {
     args = {
       nativeBuildInputs = with pkgs; with pkgs.apple_sdk_frameworks; lib.optionals stdenv.isDarwin [

diff --git a/nix/modules/rust.nix b/nix/modules/rust.nix
@@ -22,15 +22,20 @@
       in
       {
         # Clippy checks
+        # TODO: Remove after https://github.com/juspay/rust-flake/issues/23
         omnix-cli-clippy = crates."omnix-cli".crane.outputs.drv.clippy;
+        nix_rs-clippy = crates."nix_rs".crane.outputs.drv.clippy;
+        nixci-clippy = crates."nixci".crane.outputs.drv.clippy;
+        nix_health-clippy = crates."nix_health".crane.outputs.drv.clippy;
       };
 
     packages =
       let
         inherit (config.rust-project) crates;
       in
-      {
-        default = crates."omnix-cli".crane.outputs.drv.crate.overrideAttrs (oa: {
+      rec {
+        default = omnix-cli;
+        omnix-cli = crates."omnix-cli".crane.outputs.drv.crate.overrideAttrs (oa: {
           nativeBuildInputs = (oa.nativeBuildInputs or [ ]) ++ [ pkgs.installShellFiles ];
           postInstall = ''
             installShellCompletion --cmd om \
@@ -41,7 +46,11 @@
         });
 
         # Rust docs
+        # TODO: Remove after https://github.com/juspay/rust-flake/issues/23
         omnix-cli-doc = crates."omnix-cli".crane.outputs.drv.doc;
+        nix_rs-doc = crates."nix_rs".crane.outputs.drv.doc;
+        nixci-doc = crates."nixci".crane.outputs.drv.doc;
+        nix_health-doc = crates."nix_health".crane.outputs.drv.doc;
 
         /*
         gui = crates."omnix-gui".crane.outputs.drv.crate.overrideAttrs (oa: {