[DEVOPS-1120] Autogenerated code + tweaks

Author: rvl

nix/.stack-pkgs.nix

@@ -1,20 +1,14 @@
 {
-  module = { config, lib, ... }:
-    let
-      hackage = config.hackage.configs;
-    in with lib;
+  overlay = hackage:
     {
-      packages = mapAttrs (_:
-        f:
-          mkForce (if isFunction f
-            then f
-            else import f)) ({
+      packages = {
         "aeson-options" = hackage.aeson-options."0.0.0".revisions.default;
         "base58-bytestring" = hackage.base58-bytestring."0.1.0".revisions.default;
         "canonical-json" = hackage.canonical-json."0.5.0.1".revisions.default;
         "half" = hackage.half."0.2.2.3".revisions.default;
         "micro-recursion-schemes" = hackage.micro-recursion-schemes."5.0.2.2".revisions.default;
         "streaming-binary" = hackage.streaming-binary."0.3.0.1".revisions.default;
+        "katip" = hackage.katip."0.6.3.0".revision."55de9e007352cf3fb9de8de8b9ac17c1070824e07e6f6d5b676f9f3cff44d23c";
       } // {
         cardano-shell = ./.stack.nix/cardano-shell.nix;
         cardano-prelude = ./.stack.nix/cardano-prelude.nix;
@@ -23,9 +17,9 @@
         cardano-crypto = ./.stack.nix/cardano-crypto.nix;
         plutus-prototype = ./.stack.nix/plutus-prototype.nix;
         hedgehog = ./.stack.nix/hedgehog.nix;
-      });
-      compiler.version = mkForce "8.4.4";
-      compiler.nix-name = mkForce "ghc844";
+      };
+      compiler.version = "8.4.4";
+      compiler.nix-name = "ghc844";
     };
   resolver = "lts-12.10";
   compiler = "ghc-8.4.4";

nix/.stack.nix/cardano-shell.nix

@@ -25,15 +25,20 @@
     };
     components = {
       "library" = {
-        depends  = [
+        depends = [
           (hsPkgs.base)
           (hsPkgs.cardano-prelude)
-          (hsPkgs.async)
+          (hsPkgs.aeson)
+          (hsPkgs.katip)
+          (hsPkgs.ekg)
+          (hsPkgs.ekg-core)
+          (hsPkgs.concurrency)
+          (hsPkgs.safe-exceptions)
         ];
       };
       exes = {
         "cardano-shell-exe" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.cardano-shell)
             (hsPkgs.cardano-prelude)
@@ -42,10 +47,16 @@
       };
       tests = {
         "cardano-shell-test" = {
-          depends  = [
+          depends = [
             (hsPkgs.base)
             (hsPkgs.cardano-shell)
             (hsPkgs.cardano-prelude)
+            (hsPkgs.QuickCheck)
+            (hsPkgs.hspec)
+            (hsPkgs.hspec-contrib)
+            (hsPkgs.concurrency)
+            (hsPkgs.dejafu)
+            (hsPkgs.hunit-dejafu)
           ];
         };
       };