From 6e68ea72350f8dd8de155e382b713f6372bd74ea Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Tue, 8 Jun 2021 09:56:44 -0400
Subject: [PATCH] flakes: Don't run shellHook on cached dev shells

This makes the behavior of `use flake` consistent with that of `use
nix`.

Resolve #90.
---
 direnvrc                | 1 +
 tests/test.py           | 4 ++++
 tests/testenv/shell.nix | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/direnvrc b/direnvrc
index eb14d85..d153bd7 100644
--- a/direnvrc
+++ b/direnvrc
@@ -135,6 +135,7 @@ use_flake() {
 
     log_status renewed cache
   else
+    sed -i "/eval \"\$shellHook\"/d" "$profile_rc"
     log_status using cached dev shell
   fi
 
diff --git a/tests/test.py b/tests/test.py
index 74f2420..a7a83e0 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -55,6 +55,7 @@ class IntegrationTest(unittest.TestCase):
         )
         sys.stderr.write(out1.stderr)
         self.assertIn("renewed cache and derivation link", out1.stderr)
+        self.assertIn("Executing shellHook.", out1.stderr)
         self.assertEqual(out1.returncode, 0)
 
         run(["nix-collect-garbage"], check=True)
@@ -67,6 +68,7 @@ class IntegrationTest(unittest.TestCase):
         )
         sys.stderr.write(out2.stderr)
         self.assertIn("using cached derivation", out2.stderr)
+        self.assertNotIn("Executing shellHook.", out2.stderr)
         self.assertEqual(out2.returncode, 0)
 
     @unittest.skipUnless(support_flakes(), "requires flakes")
@@ -86,6 +88,7 @@ class IntegrationTest(unittest.TestCase):
         )
         sys.stderr.write(out1.stderr)
         self.assertIn("renewed cache", out1.stderr)
+        self.assertIn("Executing shellHook.", out1.stderr)
         self.assertEqual(out1.returncode, 0)
 
         run(["nix-collect-garbage"], check=True)
@@ -107,6 +110,7 @@ class IntegrationTest(unittest.TestCase):
         for symlink in inputs:
             self.assertTrue(symlink.is_dir())
         self.assertIn("using cached dev shell", out2.stderr)
+        self.assertNotIn("Executing shellHook.", out2.stderr)
 
         self.assertEqual(out2.returncode, 0)
 
diff --git a/tests/testenv/shell.nix b/tests/testenv/shell.nix
index 7437fb7..ed38bd3 100644
--- a/tests/testenv/shell.nix
+++ b/tests/testenv/shell.nix
@@ -1,4 +1,7 @@
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
   nativeBuildInputs = [ pkgs.hello ];
+  shellHook = ''
+    echo "Executing shellHook."
+  '';
 }