From e199f428b11986539e9f718d6c0e079909b7b2b4 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Fri, 24 May 2019 19:27:27 +0300
Subject: [PATCH 1/4] git:  more ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a1c953b9d1e..05ff14cb45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ dist/
 *.swp
 *.swo
 *~
+\#*
 *_flymake.hs
 result*
 **/tags

From a06e8abf3624ffbcb6e14ac493fe922dbbc7ca0b Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Thu, 16 May 2019 16:45:02 +0300
Subject: [PATCH 2/4] shell.nix:  use the shellFor newly supplied by
 haskell.nix

---
 shell.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 shell.nix

diff --git a/shell.nix b/shell.nix
new file mode 100644
index 00000000000..a9bb54c1a7f
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,16 @@
+{ withHoogle ? true
+}:
+let
+  default = import ./default.nix {};
+in
+default.nix-tools._raw.shellFor {
+  packages    = p: map (x: p."${x}") [
+    "cabal-install"
+    "io-sim"
+    "io-sim-classes"
+    "ouroboros-consensus"
+    "ouroboros-network"
+    "typed-transitions"
+  ];
+  withHoogle  = withHoogle;
+}

From 3296b3c0bf5373281cecf4938e466f1cbd780366 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Fri, 17 May 2019 23:39:13 +0300
Subject: [PATCH 3/4] shell.nix:  properly specify cabal-install dep for its
 exe

---
 shell.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index a9bb54c1a7f..c5438e4a661 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,7 +5,6 @@ let
 in
 default.nix-tools._raw.shellFor {
   packages    = p: map (x: p."${x}") [
-    "cabal-install"
     "io-sim"
     "io-sim-classes"
     "ouroboros-consensus"
@@ -13,4 +12,7 @@ default.nix-tools._raw.shellFor {
     "typed-transitions"
   ];
   withHoogle  = withHoogle;
+  buildInputs = with default.nix-tools._raw; [
+    cabal-install.components.exes.cabal
+  ];
 }

From 81e61c6ac1e82b7edb17e505f1e3abc35e3a4b20 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <serge.kosyrev@iohk.io>
Date: Tue, 18 Jun 2019 16:53:13 +0300
Subject: [PATCH 4/4] shell.nix:  review suggestions

---
 shell.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/shell.nix b/shell.nix
index c5438e4a661..972449647b9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,14 +4,14 @@ let
   default = import ./default.nix {};
 in
 default.nix-tools._raw.shellFor {
-  packages    = p: map (x: p."${x}") [
-    "io-sim"
-    "io-sim-classes"
-    "ouroboros-consensus"
-    "ouroboros-network"
-    "typed-transitions"
+  packages    = ps: with ps; [
+    io-sim
+    io-sim-classes
+    ouroboros-consensus
+    ouroboros-network
+    typed-transitions
   ];
-  withHoogle  = withHoogle;
+  inherit withHoogle;
   buildInputs = with default.nix-tools._raw; [
     cabal-install.components.exes.cabal
   ];