Simplify nix setup

README.md

@@ -3,19 +3,36 @@
 ## Building the executable
 
 ```
-$ $(nix-build utoy.nix)/bin/utoy
+$ nix build
+```
+
+## Running
+
+```
+$ nix run
 ```
 
 ## Building the Docker image
 
 ```
-$ docker load < $(nix-build nix/docker-image.nix)
+$ docker load < $(nix build .#docker --print-out-paths)
 ```
 
 ## Development Shell
 
-Includes Stack, `haskell-language-server`, `gen-hie` etc.
+Includes Stack, GHC, `haskell-language-server`, `gen-hie` etc.
 
 ```
-$ nix-shell
+$ nix develop
 ```
+
+## Running Stack and GHC
+
+```
+$ nix run .#stack
+$ nix run .#ghc
+```
+
+## TODO
+
+- [ ] Benchmark, profile and optimize search

app/Main.hs

@@ -24,6 +24,7 @@ import Network.Wai (Application)
 import Servant
   ( Accept (..)
   , Handler
+  , Header
   , MimeRender (..)
   , Server
   , ServerError (..)
@@ -61,17 +62,22 @@ app :: Application
 app = serve (Proxy :: Proxy API) server
 
 type API =
-  "bytes" :> Capture "bytes" Text :> Get '[PlainText, HTML] BytesModel
+  Header "Host" Text :> Get '[PlainText, HTML] RootModel
+  :<|> "utf8" :> Capture "bytes" Text :> Get '[PlainText, HTML] Utf8Model
   :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText, HTML] CodepointsModel
-  :<|> "text" :> Capture "text" Text :> Get '[HTML] TextModel
+  :<|> "text" :> Capture "text" Text :> Get '[PlainText, HTML] TextModel
+  :<|> "search" :> Capture "search" Text :> Get '[PlainText, HTML] SearchModel
 
 server :: Server API
 server =
-  bytesR :<|> codepointsR :<|> textR
+  rootR :<|> utf8R :<|> codepointsR :<|> textR :<|> searchR
   where
-    bytesR bytesP = do
+    rootR host' = do
+      pure $ RootModel $ fromMaybe "" host'
+
+    utf8R bytesP = do
       bytes <- Parsers.parseHexBytes bytesP `orThrow` const err400
-      pure $ BytesModel $ Decode.decodeUtf8 bytes
+      pure $ mkUtf8Model bytes
 
     codepointsR codepointsP = do
       codepoints' <- Parsers.parseCodepoints codepointsP `orThrow` const err400
@@ -80,13 +86,51 @@ server =
     textR textP = do
       pure $ TextModel textP
 
+    searchR searchP = do
+      pure $ mkSearchModel searchP
+
+-- /
+
+newtype RootModel = RootModel
+  { host :: Text
+  }
+
+examples :: [Text]
+examples =
+  [ "/text/✅🤔"
+  , "/codepoints/x2705+x1F914"
+  , "/utf8/e2.9c.85.f0.9f.a4.94"
+  ]
+
+instance MimeRender PlainText RootModel where
+  mimeRender _ model = renderText $ Text.unlines $
+    [ "⚞ utoy ⚟"
+    , ""
+    , "This is utoy, a URL-based Unicode playground. Examples:"
+    , ""
+    ] ++ map (urlBase <>) examples
+    where
+      -- We assume HTTPS here. Doesn't work for development on localhost.
+      urlBase = "https://" <> model.host
+
+instance MimeRender HTML RootModel where
+  mimeRender _ model = renderHtml $ documentWithBody $ do
+    H.h1 $ H.toHtml ("⚞ utoy ⚟" :: Text)
+    H.p $ H.toHtml ("This is utoy, a URL-based Unicode playground. Examples:" :: Text)
+    H.ul $ for_ examples $ \example -> do
+      let url = "https://" <> model.host <> example
+      H.li $ H.a ! A.href (H.toValue url) $ H.toHtml example
+
 -- /bytes/<bytes>
 
-newtype BytesModel = BytesModel
+newtype Utf8Model = Utf8Model
   { codepoints :: [([Word8], Either String Char)]
   }
 
-instance MimeRender PlainText BytesModel where
+mkUtf8Model :: [Word8] -> Utf8Model
+mkUtf8Model = Utf8Model . Decode.decodeUtf8
+
+instance MimeRender PlainText Utf8Model where
   mimeRender _ model = renderText $
     Table.render "  " $ concat
       [ [ [ Table.cl $ Text.pack $ unwords $ map showByteHex bytes
@@ -99,7 +143,7 @@ instance MimeRender PlainText BytesModel where
             Right c ->
               [ Text.pack [c]
               , Text.pack $ printf "U+%04X" c
-              , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+              , Text.pack $ intercalate ", " $ allNames c
               , Text.pack $ fromMaybe "" $ blockName c
               ]
           )
@@ -107,7 +151,7 @@ instance MimeRender PlainText BytesModel where
       | (bytes, eiC) <- model.codepoints
       ]
 
-instance MimeRender HTML BytesModel where
+instance MimeRender HTML Utf8Model where
   mimeRender _ model = renderHtml $ documentWithBody $ do
     H.table $ for_ model.codepoints $ \(bytes, eiC) -> do
       H.tr $ do
@@ -118,7 +162,7 @@ instance MimeRender HTML BytesModel where
           Right c -> do
             H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
             H.td $ H.code $ printfHtml "U+%04X" c
-            H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
             H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
 -- /codepoints/<codepoints>
@@ -128,7 +172,14 @@ newtype CodepointsModel = CodepointsModel
   }
 
 mkCodepointsModel :: [(Word, Word)] -> CodepointsModel
-mkCodepointsModel = CodepointsModel . map go . concatMap (uncurry enumFromTo)
+mkCodepointsModel =
+  CodepointsModel
+  -- Limit number of returned codepoints. Otherwise it's
+  -- too easy to provoke massive response bodies with requests like
+  -- /codepoints/0-99999999
+  . take 100000
+  . map go
+  . concatMap (uncurry enumFromTo)
   where
     go codepoint = (codepoint, toChar codepoint)
 
@@ -149,7 +200,7 @@ instance MimeRender PlainText CodepointsModel where
         Right c ->
           [ Text.pack [c]
           , Text.pack $ printf "U+%04X" c
-          , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+          , Text.pack $ intercalate ", " $ allNames c
           , Text.pack $ fromMaybe "" $ blockName c
           ]
       )
@@ -167,7 +218,7 @@ instance MimeRender HTML CodepointsModel where
           Right c -> do
             H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
             H.td $ H.code $ printfHtml "U+%04X" c
-            H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
             H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
 -- /text/<text>
@@ -177,15 +228,52 @@ newtype TextModel = TextModel
   }
 
 instance MimeRender HTML TextModel where
-  mimeRender _ model = renderHtml $ documentWithBody $ do
+  mimeRender _ model = charTableHtml $ Text.unpack model.text
-    H.table $ for_ (Text.unpack model.text) $ \c -> do
+instance MimeRender PlainText TextModel where
+  mimeRender _ model = charTableText $ Text.unpack model.text
+
+-- /search/<search>
+
+newtype SearchModel = SearchModel
+  { results :: [Char]
+  }
+
+mkSearchModel :: Text -> SearchModel
+mkSearchModel search = SearchModel $ searchAllChars search
+
+searchAllChars :: Text -> [Char]
+searchAllChars search = [c | c <- [minBound..maxBound], any (\name -> Text.toLower search `Text.isInfixOf` Text.toLower (Text.pack name)) (allNames c)]
+
+instance MimeRender HTML SearchModel where
+  mimeRender _ model = charTableHtml model.results
+
+instance MimeRender PlainText SearchModel where
+  mimeRender _ model = charTableText model.results
+
+-- Utilities
+
+charTableHtml :: [Char] -> BL.ByteString
+charTableHtml chars =
+  renderHtml $ documentWithBody $ do
+    H.table $ for_ chars $ \c -> do
       H.tr $ do
         H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
         H.td $ H.code $ printfHtml "U+%04X" c
-        H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
+        H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
         H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
--- Utilities
+
+charTableText :: [Char] -> BL.ByteString
+charTableText chars =
+  renderText $ Table.render "  "
+    [ map Table.cl
+      [ Text.pack [c]
+      , Text.pack $ printf "U+%04X" c
+      , Text.pack $ intercalate ", " $ allNames c
+      , Text.pack $ fromMaybe "" $ blockName c
+      ]
+    | c <- chars
+    ]
 
 renderText :: Text -> BL.ByteString
 renderText = BL.fromStrict . Encoding.encodeUtf8
@@ -196,6 +284,12 @@ showByteHex = printf "      %02X"
 showByteBin :: Word8 -> String
 showByteBin = printf "%08b"
 
+-- | Retrieve name and aliases (suffixed with @*@) of a 'Char'.
+allNames :: Char -> [String]
+allNames c =
+  maybeToList (UnicodeNames.name c)
+  ++ map (++ "*") (UnicodeNames.nameAliases c)
+
 blockName :: Char -> Maybe String
 blockName c = UnicodeBlocks.blockName . UnicodeBlocks.blockDefinition <$> UnicodeBlocks.block c
 
@@ -213,7 +307,7 @@ documentWithBody body =
       H.meta ! A.charset "utf-8"
       H.title "utoy"
       H.style $ H.toHtml $ Encoding.decodeUtf8 $(embedFile "static/utoy.css")
-    H.body body
+    H.body $ H.main body
 
 -- HTML routes
 

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1703693486,
+        "narHash": "sha256-tuzNTOs+1zR2BEVKKrRRGdpR/n095AXIcT8Me1px2bI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "671c2d3e1506a7ee1583515ca80cb3474fdc9c95",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "release-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,36 @@
+{
+  description = "Unicode toy";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
+
+  outputs = { self, nixpkgs }:
+    let
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+
+      utoy = pkgs.haskellPackages.developPackage {
+        root = ./.;
+      };
+    in {
+      packages.x86_64-linux = rec {
+        docker =
+          pkgs.dockerTools.buildImage {
+            name = "git.pbrinkmeier.de/paul/utoy";
+            tag = utoy.version;
+            config.Cmd = [ "${pkgs.haskell.lib.justStaticExecutables utoy}/bin/utoy" ];
+          };
+
+        default = utoy;
+      };
+
+      devShells.x86_64-linux.default =
+        (pkgs.haskellPackages.developPackage {
+          root = ./.;
+          modifier = drv:
+            pkgs.haskell.lib.addBuildTools drv [
+              pkgs.cabal-install
+              pkgs.haskellPackages.implicit-hie
+              pkgs.haskell-language-server
+            ];
+        }).env;
+  };
+}

nix/docker-image.nix

@@ -1,9 +0,0 @@
-let
-  pkgs = import ./pkgs.nix {};
-  utoy = import ../utoy.nix;
-in
-  pkgs.dockerTools.buildImage {
-    name = "git.pbrinkmeier.de/paul/utoy";
-    tag = utoy.version;
-    config.Cmd = [ "${utoy}/bin/utoy" ];
-  }

nix/haskell-deps.nix

@@ -1,13 +0,0 @@
-haskellPackages: with haskellPackages; [
-  attoparsec
-  blaze-html
-  bytestring
-  file-embed
-  http-media
-  servant-server
-  text
-  unicode-data
-  unicode-data-names
-  wai
-  warp
-]

nix/pkgs.nix

@@ -1,25 +0,0 @@
-{ overlays ? [] }:
-let
-  sources = import ./sources.nix;
-  settings = import ./settings.nix;
-
-  overlay = final: prev: {
-    haskell = prev.haskell // {
-      packages = prev.haskell.packages // {
-        "${settings.ghc}" = prev.haskell.packages."${settings.ghc}".override {
-          overrides = haskellOverlay prev;
-        };
-      };
-    };
-  };
-
-  haskellOverlay = pkgs: final: prev: {
-    attoparsec-iso8601 = prev.attoparsec-iso8601_1_1_0_0;
-    http-api-data = prev.http-api-data_0_5;
-    servant = pkgs.haskell.lib.doJailbreak prev.servant;
-    servant-server = pkgs.haskell.lib.doJailbreak prev.servant-server;
-    unicode-data = prev.unicode-data_0_4_0_1;
-    unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
-  };
-in
-  import sources.nixpkgs { overlays = overlays ++ [overlay]; }

nix/settings.nix

@@ -1,5 +0,0 @@
-{
-  # GHC version to use with Nix.
-  # Should match the one in stack.yaml.
-  ghc = "ghc943";
-}

nix/sources.json

@@ -1,26 +0,0 @@
-{
-    "niv": {
-        "branch": "master",
-        "description": "Easy dependency management for Nix projects",
-        "homepage": "https://github.com/nmattia/niv",
-        "owner": "nmattia",
-        "repo": "niv",
-        "rev": "689d0e5539eddd0b0f566aee7bb18629eee7df74",
-        "sha256": "1rld3lk42l6b01f2gcrhq8qm9vry1awmfl29zmpiqda9dy89vbx0",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/689d0e5539eddd0b0f566aee7bb18629eee7df74.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs": {
-        "branch": "nixpkgs-unstable",
-        "description": "Nix Packages collection",
-        "homepage": "",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
-        "sha256": "0kvpf63dda6nzbqd2kyr99qh1av89mva26xykp3zb4diyicp7yji",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9952d6bc395f5841262b006fbace8dd7e143b634.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}

nix/sources.nix

@@ -1,194 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
-
-  fetch_tarball = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
-
-  fetch_git = name: spec:
-    let
-      ref =
-        if spec ? ref then spec.ref else
-          if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
-      submodules = if spec ? submodules then spec.submodules else false;
-      submoduleArg =
-        let
-          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
-          emptyArgWithWarning =
-            if submodules == true
-            then
-              builtins.trace
-                (
-                  "The niv input \"${name}\" uses submodules "
-                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
-                  + "does not support them"
-                )
-                {}
-            else {};
-        in
-          if nixSupportsSubmodules
-          then { inherit submodules; }
-          else emptyArgWithWarning;
-    in
-      builtins.fetchGit
-        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
-
-  fetch_local = spec: spec.path;
-
-  fetch_builtin-tarball = name: throw
-    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=tarball -a builtin=true'';
-
-  fetch_builtin-url = name: throw
-    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=file -a builtin=true'';
-
-  #
-  # Various helpers
-  #
-
-  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (
-      concatMapStrings (s: if builtins.isList s then "-" else s)
-        (
-          builtins.split "[^[:alnum:]+._?=-]+"
-            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
-        )
-    );
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs name spec
-    else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git name spec
-    else if spec.type == "local" then fetch_local spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
-    else if spec.type == "builtin-url" then fetch_builtin-url name
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # If the environment variable NIV_OVERRIDE_${name} is set, then use
-  # the path directly as opposed to the fetched source.
-  replace = name: drv:
-    let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
-      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
-  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
-  concatMapStrings = f: list: concatStrings (map f list);
-  concatStrings = builtins.concatStringsSep "";
-
-  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem
-    , pkgs ? mkPkgs sources system
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

package.yaml

@@ -1,69 +0,0 @@
-# Adapted from new-template.hsfiles
-
-name:                utoy
-version:             0.3
-git:                 "https://git.pbrinkmeier.de/paul/utoy"
-license:             MIT
-author:              "Paul Brinkmeier"
-maintainer:          "hallo@pbrinkmeier.de"
-copyright:           "2023 Paul Brinkmeier"
-
-extra-source-files:
-- README.md
-- static/utoy.css
-
-dependencies:
-- base >= 4.7 && < 5
-- attoparsec
-- text
-
-ghc-options:
-- -Wall
-- -Wcompat
-- -Widentities
-- -Wincomplete-record-updates
-- -Wincomplete-uni-patterns
-- -Wmissing-export-lists
-- -Wmissing-home-modules
-- -Wpartial-fields
-- -Wredundant-constraints
-
-library:
-  source-dirs: src
-
-executables:
-  utoy:
-    main:                Main.hs
-    source-dirs:         app
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - utoy
-    - blaze-html
-    - bytestring
-    - file-embed
-    - http-media
-    - servant-server
-    - text
-    - unicode-data
-    - unicode-data-names
-    - wai
-    - warp
-    # Fix "Multiple files use the same module name", see
-    # https://stackoverflow.com/questions/67519851/multiple-files-use-the-same-module-name
-    when:
-    - condition: false
-      other-modules: Paths_utoy
-
-tests:
-  utoy-test:
-    main:                Spec.hs
-    source-dirs:         test
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - utoy

shell.nix

@@ -1,21 +0,0 @@
-{ pkgs ? import ./nix/pkgs.nix {} }:
-let
-  haskellDeps = import ./nix/haskell-deps.nix;
-  settings = import ./nix/settings.nix;
-  haskellPackages = pkgs.haskell.packages."${settings.ghc}";
-
-  tools = with pkgs; [
-    # nix tools
-    niv
-    nix-tree
-
-    # haskell tools
-    stack
-    (haskellPackages.ghcWithPackages haskellDeps)
-    haskellPackages.haskell-language-server
-    haskellPackages.implicit-hie
-  ];
-in
-  pkgs.mkShellNoCC {
-    nativeBuildInputs = tools;
-  }

src/UToy/Table.hs

@@ -17,7 +17,7 @@ cr :: Text -> Cell
 cr = C AlignRight
 
 render :: Text -> [[Cell]] -> Text
-render delim cells = Text.intercalate "\n" $ map showRow cells
+render delim cells = Text.unlines $ map showRow cells
   where
     showRow = Text.intercalate delim . map showCell . zipLongest columnWidths
 

stack-shell.nix

@@ -1,10 +0,0 @@
-{}:
-let
-  pkgs = import ./nix/pkgs.nix {};
-  haskellDeps = import ./nix/haskell-deps.nix;
-  settings = import ./nix/settings.nix;
-in
-  pkgs.haskell.lib.buildStackProject {
-    name = "utoy";
-    ghc = pkgs.haskell.packages."${settings.ghc}".ghcWithPackages haskellDeps;
-  }

stack.yaml

@@ -1,9 +0,0 @@
-resolver: ghc-9.4.3
-# GHC is managed through Nix
-install-ghc: false
-packages:
-- .
-nix:
-  enable: true
-  shell-file: stack-shell.nix
-  path: ["nixpkgs=./nix/pkgs.nix"]

utoy.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           utoy
-version:        0.3
+version:        0.6.1
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier

utoy.nix

@@ -1,35 +0,0 @@
-let
-  pkgs = import ./nix/pkgs.nix {};
-  settings = import ./nix/settings.nix;
-  haskellDeps = import ./nix/haskell-deps.nix;
-
-  haskellPackages = pkgs.haskell.packages."${settings.ghc}";
-
-  utoy =
-    { mkDerivation }:
-    mkDerivation {
-      version = "0.3";
-      pname = "utoy";
-      license = pkgs.lib.licenses.mit;
-      src =
-        let
-          buildFiles = [
-            ./LICENSE
-            ./utoy.cabal
-            ./Setup.hs
-            ./app
-            ./src
-            ./static
-            ./test
-          ];
-        in
-          pkgs.lib.sources.cleanSourceWith {
-            src = ./.;
-            filter = path: _type: pkgs.lib.any (prefix: pkgs.lib.hasPrefix (toString prefix) path) buildFiles;
-          };
-
-      libraryHaskellDepends = haskellDeps haskellPackages;
-    };
-in
-  pkgs.haskell.lib.justStaticExecutables
-    (haskellPackages.callPackage utoy {})