treewide: move code into rust and nix directories

nikstur · Feb 29, 2024 · e651701 · e651701
1 parent 07093ff
commit e651701
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 6 deletions.
diff --git a/flake.nix b/flake.nix
@@ -75,23 +75,23 @@
 
     perSystem = { config, system, pkgs, lib, ... }:
       let
-        rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./transformer/rust-toolchain.toml;
+        rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust/transformer/rust-toolchain.toml;
         craneLib = inputs.crane.lib.${system}.overrideToolchain rustToolChain;
 
         # Include the Git commit hash as the version of bombon in generated Boms
         GIT_COMMIT = lib.optionalString (self ? rev) self.rev;
 
         commonArgs = {
-          src = craneLib.cleanCargoSource ./transformer;
+          src = craneLib.cleanCargoSource ./rust/transformer;
           inherit GIT_COMMIT;
         };
         cargoArtifacts = craneLib.buildDepsOnly commonArgs;
         transformer = craneLib.buildPackage (commonArgs // { inherit cargoArtifacts; });
 
-        buildBom = pkgs.callPackage ./build-bom.nix {
+        buildBom = pkgs.callPackage ./nix/build-bom.nix {
           inherit transformer;
-          buildtimeDependencies = pkgs.callPackage ./buildtime-dependencies.nix { };
-          runtimeDependencies = pkgs.callPackage ./runtime-dependencies.nix { };
+          buildtimeDependencies = pkgs.callPackage ./nix/buildtime-dependencies.nix { };
+          runtimeDependencies = pkgs.callPackage ./nix/runtime-dependencies.nix { };
         };
       in
       {
@@ -111,7 +111,7 @@
         checks = {
           clippy = craneLib.cargoClippy (commonArgs // { inherit cargoArtifacts; });
           rustfmt = craneLib.cargoFmt (commonArgs // { inherit cargoArtifacts; });
-        } // import ./tests { inherit pkgs buildBom; };
+        } // import ./nix/tests { inherit pkgs buildBom; };
 
         pre-commit = {
           check.enable = true;

diff --git a/build-bom.nix → nix/build-bom.nix b/build-bom.nix → nix/build-bom.nix
diff --git a/buildtime-dependencies.nix → nix/buildtime-dependencies.nix b/buildtime-dependencies.nix → nix/buildtime-dependencies.nix
diff --git a/runtime-dependencies.nix → nix/runtime-dependencies.nix b/runtime-dependencies.nix → nix/runtime-dependencies.nix
diff --git a/tests/default.nix → nix/tests/default.nix b/tests/default.nix → nix/tests/default.nix
diff --git a/transformer/Cargo.lock → rust/transformer/Cargo.lock b/transformer/Cargo.lock → rust/transformer/Cargo.lock
diff --git a/transformer/Cargo.toml → rust/transformer/Cargo.toml b/transformer/Cargo.toml → rust/transformer/Cargo.toml
diff --git a/transformer/rust-toolchain.toml → rust/transformer/rust-toolchain.toml b/transformer/rust-toolchain.toml → rust/transformer/rust-toolchain.toml
diff --git a/transformer/src/buildtime_input.rs → rust/transformer/src/buildtime_input.rs b/transformer/src/buildtime_input.rs → rust/transformer/src/buildtime_input.rs
diff --git a/transformer/src/cli.rs → rust/transformer/src/cli.rs b/transformer/src/cli.rs → rust/transformer/src/cli.rs
diff --git a/transformer/src/cyclonedx.rs → rust/transformer/src/cyclonedx.rs b/transformer/src/cyclonedx.rs → rust/transformer/src/cyclonedx.rs
diff --git a/transformer/src/main.rs → rust/transformer/src/main.rs b/transformer/src/main.rs → rust/transformer/src/main.rs
diff --git a/transformer/src/runtime_input.rs → rust/transformer/src/runtime_input.rs b/transformer/src/runtime_input.rs → rust/transformer/src/runtime_input.rs
diff --git a/transformer/src/transform.rs → rust/transformer/src/transform.rs b/transformer/src/transform.rs → rust/transformer/src/transform.rs