Revert "feat(flake): private fra input, export pre-sgxs binary package"

This reverts commit 6a2b7ed.

Author: ozwaldorf

flake.lock

@@ -12,12 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
-
-    # Private source
-    fleek-remote-attestation = {
-      url = "github:fleek-network/fleek-remote-attestation";
-      flake = false;
-    };
   };
 
   nixConfig = {
@@ -32,7 +26,6 @@
       crane,
       fenix,
       flake-utils,
-      fleek-remote-attestation,
       ...
     }:
     flake-utils.lib.eachSystem
@@ -115,28 +108,7 @@
             }
           );
 
-          # SGX Service enclave
-          enclave = craneLib.buildPackage rec {
-            src = ./services/sgx/enclave;
-            cargoVendorDir = craneLib.vendorCargoDeps ({
-              inherit src;
-              # Patch private repo with flake input
-              overrideVendorGitCheckout =
-                ps: drv:
-                if
-                  lib.any (
-                    p: (lib.hasPrefix "git+https://github.com/fleek-network/fleek-remote-attestation.git" p.source)
-                  ) ps
-                then
-                  drv.overrideAttrs (_old: {
-                    src = fleek-remote-attestation;
-                  })
-                else
-                  drv;
-            });
-            cargoArtifacts = null;
-            doCheck = false;
-          };
+          src = craneLib.path ./.;
 
           librusty_v8 = (
             let
@@ -163,7 +135,12 @@
 
           gitRev = if (self ? rev) then self.rev else self.dirtyRev;
 
-          src = craneLib.path ./.;
+          # SGX Service enclave
+          enclave = craneLib.buildPackage {
+            src = ./services/sgx/enclave;
+            cargoArtifacts = null;
+            doCheck = false;
+          };
 
           # Common arguments can be set here to avoid repeating them later
           commonArgs = {
@@ -227,7 +204,6 @@
                 pkgs.libiconv
                 pkgs.darwin.apple_sdk.frameworks.QuartzCore
               ];
-
           } // commonVars;
 
           commonVars =
@@ -351,14 +327,10 @@
                   ];
               };
 
-              # Individual services
               fn-service-0 = mkLightningBin "fn-service-0";
               fn-service-1 = mkLightningBin "fn-service-1";
               fn-service-2 = mkLightningBin "fn-service-2";
               fn-service-3 = mkLightningBin "fn-service-3";
-
-              # Enclave binary (pre-sgxs)
-              fn-sgx-enclave = enclave;
             };
 
           # Allow using `nix run` on the project

flake.nix

@@ -59,6 +59,7 @@ impl UsercallExtension for ExternalService {
                 if let Some(method) = subdomain.strip_suffix(".attest") {
                     match method {
                         "target_info" | "quote" | "collateral" => {
+                            println!("handle {method} endpoint");
                             let stream = Box::new(AttestationEndpoint::new(
                                 method,
                                 self.attest_state.clone(),