git.delta.rocks / fleet / refs/commits / 3ff14079c557

--- a/flake.lock
+++ b/flake.lock
@@ -49,6 +49,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fleet-tf": {
       "inputs": {
         "flake-parts": [
@@ -124,6 +142,21 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1687178632,
+        "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1781820577,
@@ -171,6 +204,46 @@
         "type": "github"
       }
     },
+    "nocargo": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nix-filter": "nix-filter",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "registry-crates-io": [
+          "registry-crates-io"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778181426,
+        "owner": "deltaex",
+        "repo": "nocargo",
+        "rev": "10b5ad93582992ed19bf2bd92840e544601cced4",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "deltaex",
+        "repo": "nocargo",
+        "type": "gitlab"
+      }
+    },
+    "registry-crates-io": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1783425179,
+        "narHash": "sha256-g9gZx0E3isjuTXGwmkY7pVmYAkYDn0UucxO5c+GOpvw=",
+        "owner": "rust-lang",
+        "repo": "crates.io-index",
+        "rev": "c4f52e3ab01b43153b474dda067993b982457908",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "repo": "crates.io-index",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "crane": "crane",
@@ -178,6 +251,8 @@
         "fleet-tf": "fleet-tf",
         "nix": "nix",
         "nixpkgs": "nixpkgs",
+        "nocargo": "nocargo",
+        "registry-crates-io": "registry-crates-io",
         "rust-overlay": "rust-overlay",
         "shelly": "shelly",
         "treefmt-nix": "treefmt-nix"
@@ -216,6 +291,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [

--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,15 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     crane.url = "github:ipetkov/crane";
+    nocargo = {
+      url = "gitlab:deltaex/nocargo";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.registry-crates-io.follows = "registry-crates-io";
+    };
+    registry-crates-io = {
+      url = "github:rust-lang/crates.io-index";
+      flake = false;
+    };
     shelly.url = "github:CertainLach/shelly";
     fleet-tf = {
       url = "github:CertainLach/fleet-tf";
@@ -136,6 +145,7 @@
               let
                 packages = pkgs.callPackages ./pkgs {
                   inherit craneLib inputs;
+                  rustToolchain = rust;
                 };
               in
               packages // { default = packages.fleet; }

--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,12 +2,16 @@
   callPackage,
   craneLib,
   inputs,
+  rustToolchain ? null,
 }:
 let
   remowt-agents-bundle = callPackage ./remowt-agents-bundle.nix { inherit craneLib; };
 in
 {
   fleet = callPackage ./fleet.nix { inherit craneLib inputs remowt-agents-bundle; };
+  fleet-nocargo = callPackage ./fleet-nocargo.nix {
+    inherit inputs remowt-agents-bundle rustToolchain;
+  };
   fleet-install-secrets = callPackage ./fleet-install-secrets.nix { inherit craneLib; };
   fleet-generator-helper = callPackage ./fleet-generator-helper.nix { inherit craneLib; };
   fleet-usbd = callPackage ./fleet-usbd.nix { inherit craneLib inputs; };