refactor(flake): remove crane

importantimport · Mar 5, 2025 · faf14a8 · faf14a8
1 parent e281009
commit faf14a8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 161 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,20 +1,17 @@
 {
-  description = "Description for the project";
+  description = "github:importantimport/hatsu";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
 
-    crane.url = "github:ipetkov/crane";
-
     fenix.url = "github:nix-community/fenix/monthly";
     fenix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
     inputs@{
-      crane,
       fenix,
       flake-parts,
       nixpkgs,
@@ -47,165 +44,45 @@
               targets.x86_64-unknown-linux-gnu.latest.rust-std
               targets.x86_64-unknown-linux-musl.latest.rust-std
             ];
-
-          craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
-
-          # https://github.com/ipetkov/crane/blob/master/docs/source-filtering.md
-          src = lib.cleanSourceWith {
-            name = "source";
-            src = ./.;
-            filter =
-              path: type:
-              (lib.hasInfix "/contrib/" path)
-              || (lib.hasInfix "/crates/backend/assets/" path)
-              || (lib.hasInfix "/crates/frontend/assets/" path)
-              || (craneLib.filterCargoSources path type);
-          };
-
-          commonArgs = {
-            inherit src;
-            strictDeps = true;
-          };
-
-          cargoArtifacts = craneLib.buildDepsOnly commonArgs;
-
-          cargoFmt = craneLib.cargoFmt {
-            inherit src;
-          };
-
-          cargoClippy = craneLib.cargoClippy (
-            commonArgs
-            // {
-              inherit cargoArtifacts;
-              cargoClippyExtraArgs = "--all-targets -- -W clippy::pedantic -W clippy::nursery -A clippy::missing-errors-doc -A clippy::module_name_repetitions";
-            }
-          );
-
-          cargoNextest = craneLib.cargoNextest (
-            commonArgs
-            // {
-              inherit cargoArtifacts;
-              partitions = 1;
-              partitionType = "count";
-            }
-          );
-
-          # TODO: cargoHakari = craneLib.mkCargoDerivation
-          # https://crane.dev/examples/quick-start-workspace.html
-
-          buildHatsu =
-            args:
-            craneLib.buildPackage (
-              commonArgs
-              // {
-                inherit cargoArtifacts;
-              }
-              // lib.optionalAttrs (!isNull args) args
-            );
-
-          hatsu = buildHatsu { };
         in
         {
-          checks = {
-            inherit
-              cargoFmt
-              cargoClippy
-              cargoNextest
-              hatsu
-              ;
-          };
-
-          packages =
-            let
-              aarch64Args =
-                let
-                  inherit (pkgs.pkgsCross.aarch64-multiplatform.stdenv) cc;
-                in
-                {
-                  depsBuildBuild = [
-                    cc
-                    pkgs.qemu
-                  ];
-
-                  HOST_CC = "${cc.nativePrefix}cc";
-                  TARGET_CC = "${cc.targetPrefix}cc";
-                  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER = "qemu-aarch64";
-                  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "${cc}/bin/${cc.targetPrefix}cc";
-                  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER = "qemu-aarch64";
-                  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER = "${cc}/bin/${cc.targetPrefix}cc";
-                };
-              x86_64Args =
-                let
-                  inherit (pkgs.stdenv) cc;
-                in
-                {
-                  depsBuildBuild = [ cc ];
-                  HOST_CC = "${cc.nativePrefix}cc";
-                  TARGET_CC = "${cc.targetPrefix}cc";
-                };
-              muslArgs = {
-                # TODO: fix musl build
-                # https://crane.dev/examples/cross-musl.html
-                CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
-              };
-            in
-            {
-              default = hatsu;
-              aarch64-unknown-linux-gnu = buildHatsu (
-                {
-                  CARGO_BUILD_TARGET = "aarch64-unknown-linux-gnu";
-                }
-                // aarch64Args
-              );
-              aarch64-unknown-linux-musl = buildHatsu (
-                {
-                  CARGO_BUILD_TARGET = "aarch64-unknown-linux-musl";
-                }
-                // aarch64Args
-                // muslArgs
-              );
-              x86_64-unknown-linux-gnu = buildHatsu (
-                {
-                  CARGO_BUILD_TARGET = "x86_64-unknown-linux-gnu";
-                }
-                // x86_64Args
-              );
-              x86_64-unknown-linux-musl = buildHatsu (
-                {
-                  CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
-                }
-                // x86_64Args
-                // muslArgs
-              );
-            };
-          devShells.default = craneLib.devShell {
-            # checks = self'.checks.${system};
-            inputsFrom = [ hatsu ];
+          devShells.default = pkgs.mkShell {
             packages =
-              (with pkgs; [
+              [ toolchain ]
+              ++ (with pkgs; [
                 mdbook # ./docs/
 
                 # cargo-*
-                cargo-hakari
-                cargo-nextest
+                # cargo-hakari
+                # cargo-nextest
                 cargo-watch
 
                 # sea-orm
                 sea-orm-cli
 
-                just
+                # just
                 # mold
                 # sccache
               ])
               ++ (with fenix.packages.${system}; [
                 rust-analyzer
               ]);
           };
+
+          packages.default =
+            let
+              version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).workspace.package.version;
+              rustPlatform = pkgs.makeRustPlatform {
+                cargo = toolchain;
+                rustc = toolchain;
+              };
+            in
+            rustPlatform.buildRustPackage {
+              inherit version;
+              pname = "hatsu";
+              src = ./.;
+              cargoLock.lockFile = ./Cargo.lock;
+            };
         };
-      flake = {
-        # The usual flake attributes can be defined here, including system-
-        # agnostic ones like nixosModule and system-enumerating ones, although
-        # those are more easily expressed in perSystem.
-      };
     };
 }