Merge pull request #25 from vst/24-fix-build

fix(deps): upgrade table-layout to v1.0.0.0
vst · May 2, 2024 · db1e044 · db1e044
2 parents c10ed56 + 5d2cb91
commit db1e044
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/default.nix b/default.nix
@@ -61,6 +61,7 @@ let
     overrides = self: super: {
       bytehash = pkgs.haskell.lib.dontCheck super.bytehash;
       hetzner = self.hetzner_0_6_0_0;
+      table-layout = self.callCabal2nixWithOptions "table-layout" sources.table-layout "--no-check" { };
     };
   };
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -10,5 +10,12 @@
         "type": "tarball",
         "url": "https://github.com/NixOS/nixpkgs/archive/8468b0786c4f5a4e5eab5a4921b75a0139b0474d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "table-layout": {
+        "sha256": "0vbz8lmjzxz9flpnzjfhis85ck3q6zfn6xa1ms8j5gcgh1bfjilr",
+        "type": "tarball",
+        "url": "https://hackage.haskell.org/package/table-layout-1.0.0.0/table-layout-1.0.0.0.tar.gz",
+        "url_template": "https://hackage.haskell.org/package/table-layout-<version>/table-layout-<version>.tar.gz",
+        "version": "1.0.0.0"
     }
 }
diff --git a/src/Clompse/Cli.hs b/src/Clompse/Cli.hs
@@ -201,7 +201,7 @@ doServerListConsole rs =
         ]
       hs =
         Tab.titlesH
-          [ "#"
+          [ "#" :: String
           , "Profile"
           , "Provider"
           , "Region"
@@ -232,7 +232,8 @@ doServerListConsole rs =
           , T.intercalate "," (fmap Z.Net.ipv4ToText (_serverListItemIPv4Static <> _serverListItemIPv4Public))
           ]
       rows = fmap (uncurry mkRows) (zip [1 :: Int ..] rs)
-   in putStrLn $ Tab.tableString cs Tab.unicodeS hs rows
+      table = Tab.columnHeaderTableS cs Tab.unicodeS hs rows
+   in putStrLn $ Tab.tableString table
 
 
 formatIntegral :: Integral a => a -> T.Text