From 25ab58bcda4bdd351ab21d549ed46bc2eec79e6d Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob@jhink.org>
Date: Fri, 30 Sep 2022 20:13:49 -0400
Subject: [PATCH] Rearrange flake.nix to call mkPoetryEnv directly instead of
 with mkShell

---
 flake.nix | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index fa66981..be90c25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,32 +26,26 @@
         python = pkgs.python310;
       in
       {
-        #apps = {
-          #nancy = pkgs.nancy;
-        #};
-        #defaultApp = pkgs.nancy;
-
         defaultPackage = pkgs.nancy;
 
-
-        devShell = pkgs.mkShell {
-          buildInputs = with pkgs; with python.pkgs; [
-            nixpkgs-fmt
-            black
-            poetry
-            pkgs.pre-commit
-            sqlite
-            (pkgs.poetry2nix.mkPoetryEnv {
+        devShell =
+          let
+            e = pkgs.poetry2nix.mkPoetryEnv {
               inherit python;
               projectDir = ./.;
-              pyproject = ./pyproject.toml;
-              poetrylock = ./poetry.lock;
               editablePackageSources = {
                 nancy = ./src;
               };
-            })
-          ];
-          shellHook = "echo 'Execute `poetry shell` to access an environment with an editable install.'";
-        };
+            };
+          in
+          e.env.overrideAttrs (oldAttrs: {
+            buildInputs = with pkgs; with python.pkgs; [
+              nixpkgs-fmt
+              black
+              poetry
+              pkgs.pre-commit
+              sqlite
+            ];
+          });
       }));
 }