diff --git a/.cargo/config.toml b/.cargo/config.toml index 1a992d1..216ddda 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,17 +2,5 @@ linker = "clang" rustflags = [ "-C", "link-arg=-fuse-ld=mold", - # (Nightly) Make the current crate share its generic instantiations - "-Zshare-generics=y", ] -[unstable] -codegen-backend = true - -[profile.dev] -codegen-backend = "cranelift" - -[profile.dev.package."*"] -codegen-backend = "llvm" - - diff --git a/.envrc b/.envrc index cffc922..a7cb2df 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use flake . --impure +use flake . --impure --show-trace diff --git a/flake.lock b/flake.lock index 3ea3eb2..b536772 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "crane": { - "locked": { - "lastModified": 1731974733, - "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -72,7 +57,6 @@ }, "root": { "inputs": { - "crane": "crane", "fenix": "fenix", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 7b3d920..fd6cb95 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - }; fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -19,7 +15,6 @@ outputs = { self, nixpkgs, - crane, fenix, flake-utils, ... @@ -27,11 +22,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - craneLib = crane.lib.${system}; - rs-toolchain = with fenix.packages.${system}; - combine [ - complete.toolchain - ]; + rs-toolchain = with fenix.packages.${system}; combine [stable.toolchain]; in { devShells.default = pkgs.mkShell rec { buildInputs = with pkgs; [