From 03d49c5808b564c406e95885b2668b2b815ac518 Mon Sep 17 00:00:00 2001 From: whs Date: Mon, 8 Jan 2024 16:11:06 +0800 Subject: [PATCH 1/2] Use overlay for devshell --- src/lib/dev/mkShell.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/dev/mkShell.nix b/src/lib/dev/mkShell.nix index cc94b3c2..c0d15bbd 100644 --- a/src/lib/dev/mkShell.nix +++ b/src/lib/dev/mkShell.nix @@ -4,6 +4,11 @@ let inherit (requireInput "devshell" "github:numtide/devshell" "std.lib.dev.mkShell") devshell nixago; l = inputs.nixpkgs.lib // builtins; + + pkgs = import inputs.nixpkgs { + inherit (inputs.nixpkgs) system; + overlays = [inputs.devshell.overlays.default]; + }; in configuration: let nixagoModule = { @@ -55,6 +60,6 @@ in }; }; in - devshell.legacyPackages.mkShell { + pkgs.devshell.mkShell { imports = [configuration nixagoModule]; } From 3b629918e2dad6983d211fe2115244f334be10c4 Mon Sep 17 00:00:00 2001 From: whs Date: Mon, 8 Jan 2024 18:10:51 +0800 Subject: [PATCH 2/2] Do not use inputs --- src/lib/dev/mkShell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/dev/mkShell.nix b/src/lib/dev/mkShell.nix index c0d15bbd..d9efbb24 100644 --- a/src/lib/dev/mkShell.nix +++ b/src/lib/dev/mkShell.nix @@ -7,7 +7,7 @@ let pkgs = import inputs.nixpkgs { inherit (inputs.nixpkgs) system; - overlays = [inputs.devshell.overlays.default]; + overlays = [devshell.overlays.default]; }; in configuration: let