From 67ff01393cfe5bbdb30a86c5800b39837d2041ed Mon Sep 17 00:00:00 2001 From: eureka-cpu Date: Thu, 18 Jul 2024 16:13:13 -0700 Subject: [PATCH] Update toolchain folder path --- flake.nix | 6 +++--- {dev => toolchains}/haskell-toolchain.nix | 0 {dev => toolchains}/rust-toolchain.nix | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename {dev => toolchains}/haskell-toolchain.nix (100%) rename {dev => toolchains}/rust-toolchain.nix (100%) diff --git a/flake.nix b/flake.nix index 28a3e4f..d8a509c 100644 --- a/flake.nix +++ b/flake.nix @@ -44,8 +44,8 @@ inherit (pkgs) lib; # Language toolchains - rustToolchain = pkgs.callPackage ./dev/rust-toolchain.nix { inherit fenix versatus; }; - haskellToolchain = pkgs.callPackage ./dev/haskell-toolchain.nix pkgs; + rustToolchain = pkgs.callPackage ./toolchains/rust-toolchain.nix { inherit fenix versatus; }; + haskellToolchain = pkgs.callPackage ./toolchains/haskell-toolchain.nix pkgs; # Overrides the default crane rust-toolchain with fenix. craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain.fenix-pkgs; @@ -332,7 +332,7 @@ rust = final: prev: { # This contains a lot of policy decisions which rust toolchain is used craneLib = (self.inputs.crane.mkLib prev).overrideToolchain final.rustToolchain.fenix-pkgs; - rustToolchain = prev.callPackage ./dev/rust-toolchain.nix { + rustToolchain = prev.callPackage ./toolchains/rust-toolchain.nix { inherit (self.inputs) fenix versatus; }; diff --git a/dev/haskell-toolchain.nix b/toolchains/haskell-toolchain.nix similarity index 100% rename from dev/haskell-toolchain.nix rename to toolchains/haskell-toolchain.nix diff --git a/dev/rust-toolchain.nix b/toolchains/rust-toolchain.nix similarity index 100% rename from dev/rust-toolchain.nix rename to toolchains/rust-toolchain.nix