fix: Frontend and src

* Use fenix for rust toolchain

Author: Anderssorby

Yatima/Compiler.lean

@@ -1 +1 @@
-import Yatima.Compiler.FromLean
+import Yatima.Compiler.Frontend

flake.lock

@@ -3,35 +3,38 @@
 
   inputs = {
     lean = {
-      url = github:leanprover/lean4;
+      url = "github:leanprover/lean4/v4.0.0-m5";
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ipld = {
-      url = github:yatima-inc/Ipld.lean;
+      url = "github:yatima-inc/Ipld.lean";
       inputs.lean.follows = "lean";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nixpkgs.url = github:nixos/nixpkgs/nixos-21.11;
+    yatima-std = {
+      # url = "github:yatima-inc/YatimaStdLib.lean";
+      url = "github:anderssorby/YatimaStdLib.lean/acs/add-flake";
+      inputs.lean.follows = "lean";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     naersk = {
       url = github:nix-community/naersk;
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils = {
-      url = github:numtide/flake-utils;
+      url = "github:numtide/flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    utils = {
-      url = github:yatima-inc/nix-utils;
-      inputs.flake-utils.follows = "flake-utils";
+    fenix = {
+      url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.naersk.follows = "naersk";
     };
   };
 
-  outputs = { self, lean, flake-utils, utils, nixpkgs, naersk, ipld }:
+  outputs = { self, lean, flake-utils, nixpkgs, naersk, ipld, yatima-std, fenix }:
     let
       supportedSystems = [
         # "aarch64-linux"
@@ -45,19 +48,38 @@
       let
         leanPkgs = lean.packages.${system};
         pkgs = nixpkgs.legacyPackages.${system};
-        lib = utils.lib.${system};
-        inherit (lib) buildRustProject getRust;
-        rustNightly = getRust { date = "2022-05-12"; sha256 = "sha256-ttn4r8k3yzreTgsMSJAg37uZWHuZBPUDsBhJDkASyWM="; };
+        rust = fenix.packages.${system}.complete;
+        inherit (rust) cargo rustc;
+        # Get a naersk with the input rust version
+        naerskWithRust = rust: naersk.lib."${system}".override {
+          inherit (rust) cargo rustc;
+        };
+        env = with pkgs; {
+          LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+        };
+        # Naersk using the default rust version
+        buildRustProject = pkgs.makeOverridable ({ naersk ? naerskWithRust rust, ... } @ args: with pkgs; naersk.buildPackage ({
+          buildInputs = [
+            clang
+            pkg-config
+          ] ++ lib.optionals stdenv.isDarwin [
+            darwin.apple_sdk.frameworks.Security
+          ];
+          copyLibs = true;
+          copyBins = true;
+          targets = [ ];
+          remapPathPrefix =
+            true; # remove nix store references for a smaller output package
+        } // env // args));
         yatima-rs = buildRustProject {
-          rust = rustNightly;
           src = ./yatima-rs;
           copyLibs = true;
         };
         project = leanPkgs.buildLeanPackage {
           debug = false;
           deps = [ ipld.project.${system} ];
           name = "Yatima";
-          src = ./src;
+          src = ./.;
         };
         main = leanPkgs.buildLeanPackage {
           debug = false;