From 10b3f3da0fcbd50d8f448046d04f6f41dd388804 Mon Sep 17 00:00:00 2001 From: reo101 Date: Fri, 17 Feb 2023 02:43:18 +0200 Subject: [PATCH] feat(devShells): move to separate directory --- flake.nix | 2 +- shells/default.nix | 6 ++++++ shell.nix => shells/default/default.nix | 4 +--- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 shells/default.nix rename shell.nix => shells/default/default.nix (73%) diff --git a/flake.nix b/flake.nix index bdd070d..8ec2f53 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ # Dev Shells (`nix develop`) devShells = forEachPkgs (pkgs: - import ./shell.nix { inherit pkgs; } + import ./shells { inherit pkgs; } ); # Formatter diff --git a/shells/default.nix b/shells/default.nix new file mode 100644 index 0000000..b94d183 --- /dev/null +++ b/shells/default.nix @@ -0,0 +1,6 @@ +# If pkgs is not defined, instanciate nixpkgs from locked commit +{ pkgs ? (import ../nixpkgs.nix) { } +, ... +}: { + default = import ./default { inherit pkgs; }; +} diff --git a/shell.nix b/shells/default/default.nix similarity index 73% rename from shell.nix rename to shells/default/default.nix index 54e9d5a..b6917af 100644 --- a/shell.nix +++ b/shells/default/default.nix @@ -1,7 +1,5 @@ # Shell for bootstrapping flake-enabled nix and other tooling -# If pkgs is not defined, instanciate nixpkgs from locked commit -{ pkgs ? - (import ./nixpkgs.nix) { } +{ pkgs , ... }: { default = pkgs.mkShell {