Merge pull request #3 from juspay/mono-repo

Move Rust project to a sub directory
juspay · May 29, 2023 · f3915c1 · f3915c1
2 parents 5b2136a + 08cd1b8
commit f3915c1
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,2 @@
 result
 .direnv
-
-
-# Added by cargo
-
-/target
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -0,0 +1,2 @@
+# Added by cargo
+/target
diff --git a/Cargo.lock → backend/Cargo.lock b/Cargo.lock → backend/Cargo.lock
diff --git a/Cargo.toml → backend/Cargo.toml b/Cargo.toml → backend/Cargo.toml
diff --git a/backend/default.nix b/backend/default.nix
@@ -0,0 +1,27 @@
+{
+  perSystem = { self', pkgs, lib, ... }:
+    let
+      src = lib.sourceFilesBySuffices ./. [ ".rs" ".toml" "Cargo.lock" ];
+      inherit (lib.importTOML (src + "/Cargo.toml")) package;
+    in
+    {
+      packages = {
+        ${package.name} = pkgs.rustPlatform.buildRustPackage {
+          pname = package.name;
+          inherit (package) version;
+          inherit src;
+          cargoLock.lockFile = (src + "/Cargo.lock");
+        };
+        default = self'.packages.${package.name};
+      };
+
+      devShells.backend = pkgs.mkShell {
+        inherit (package) name;
+        inputsFrom = [ self'.packages.${package.name} ];
+        packages = with pkgs; [
+          rust-analyzer
+          nil
+        ];
+      };
+    };
+}
diff --git a/src/main.rs → backend/src/main.rs b/src/main.rs → backend/src/main.rs
diff --git a/flake.nix b/flake.nix
@@ -9,39 +9,24 @@
   outputs = inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = import inputs.systems;
-      imports = [ inputs.treefmt-nix.flakeModule ];
+      imports = [
+        inputs.treefmt-nix.flakeModule
+        ./backend
+      ];
 
-      perSystem = { self', pkgs, lib, ... }:
-        let
-          src = lib.sourceFilesBySuffices inputs.self [ ".rs" ".toml" "Cargo.lock" ];
-          inherit (lib.importTOML (src + "/Cargo.toml")) package;
-        in
-        {
-          packages = {
-            ${package.name} = pkgs.rustPlatform.buildRustPackage {
-              pname = package.name;
-              inherit (package) version;
-              inherit src;
-              cargoLock.lockFile = (src + "/Cargo.lock");
-            };
-            default = self'.packages.${package.name};
-          };
-
-          devShells.default = pkgs.mkShell {
-            inherit (package) name;
-            inputsFrom = [ self'.packages.${package.name} ];
-            packages = with pkgs; [
-              rust-analyzer
-              nil
-            ];
-          };
+      perSystem = { self', pkgs, lib, ... }: {
+        devShells.default = pkgs.mkShell {
+          inputsFrom = [
+            self'.devShells.backend
+          ];
+        };
 
-          # Run `nix fmt` to format the source tree.
-          treefmt = {
-            projectRootFile = "flake.nix";
-            programs.nixpkgs-fmt.enable = true;
-            programs.rustfmt.enable = true;
-          };
+        # Run `nix fmt` to format the source tree.
+        treefmt = {
+          projectRootFile = "flake.nix";
+          programs.nixpkgs-fmt.enable = true;
+          programs.rustfmt.enable = true;
         };
+      };
     };
 }