From e5a6175e044d69b8f598a2c2acb9bcfd77b9001c Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 21 Aug 2023 20:36:12 -0400
Subject: Refactor the build system for readability

Lots of changes here but the code is much improved. The nix code is clearer and
structured better.

The Haskell code improved in response to the nix changes. I needed to use a
qualified path instead of the abspath because the BIZ_ROOT changes based on
whether bild runs in nix or runs in the user environment.

Rather than passing every argument into Builder.nix, now I just pass the json
from bild and deconstruct it in nix. This is obviously a much better design and
it only came to be after sleeping on it the other night.
---
 Biz/Bild/Deps/C.nix       |   3 +
 Biz/Bild/Deps/Haskell.nix | 144 +++++++++++++++++++++++-----------------------
 2 files changed, 74 insertions(+), 73 deletions(-)
 create mode 100644 Biz/Bild/Deps/C.nix

(limited to 'Biz/Bild/Deps')

diff --git a/Biz/Bild/Deps/C.nix b/Biz/Bild/Deps/C.nix
new file mode 100644
index 0000000..45cae1b
--- /dev/null
+++ b/Biz/Bild/Deps/C.nix
@@ -0,0 +1,3 @@
+[
+  "libsodium"
+]
diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix
index 066fd86..f34bfab 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Biz/Bild/Deps/Haskell.nix
@@ -1,76 +1,74 @@
-hpkgs:
+# This is the global set of Haskell packages which gets deployed to Hoogle, and
+# is available for selecting.
 
-# This is the global set of Haskell packages which gets deployed to Hoogle.
-
-with hpkgs;
 [
-  MonadRandom
-  QuickCheck
-  SafeSemaphore
-  acid-state
-  aeson
-  async
-  bytestring
-  clay
-  cmark
-  cmark-lucid
-  conduit
-  conduit-extra
-  config-ini
-  containers
-  directory
-  docopt
-  envy
-  fast-logger
-  filepath
-  github
-  hashids
-  haskeline
-  hmacaroons
-  hostname
-  http-types
-  ixset
-  katip
-  lucid
-  monad-logger
-  monad-metrics
-  mtl
-  neat-interpolation
-  network-uri
-  niv
-  optparse-simple
-  parsec
-  process
-  protolude
-  quickcheck-instances
-  rainbow
-  random
-  regex-applicative
-  req
-  safecopy
-  servant
-  servant-auth
-  servant-auth-server
-  servant-lucid
-  servant-server
-  split
-  stm
-  stripe-haskell
-  tasty
-  tasty-hunit
-  tasty-quickcheck
-  text
-  time
-  transformers
-  unagi-chan
-  unix
-  unordered-containers
-  uuid
-  vector
-  wai
-  wai-app-static
-  wai-extra
-  wai-middleware-metrics
-  warp
-  x509
+  "MonadRandom"
+  "QuickCheck"
+  "SafeSemaphore"
+  "acid-state"
+  "aeson"
+  "async"
+  "base"
+  "bytestring"
+  "clay"
+  "cmark"
+  "cmark-lucid"
+  "conduit"
+  "conduit-extra"
+  "config-ini"
+  "containers"
+  "directory"
+  "docopt"
+  "envy"
+  "fast-logger"
+  "filepath"
+  "github"
+  "hashids"
+  "haskeline"
+  "hostname"
+  "http-types"
+  "ixset"
+  "katip"
+  "lucid"
+  "monad-logger"
+  "monad-metrics"
+  "mtl"
+  "neat-interpolation"
+  "network-uri"
+  "niv"
+  "optparse-simple"
+  "parsec"
+  "process"
+  "protolude"
+  "quickcheck-instances"
+  "rainbow"
+  "random"
+  "regex-applicative"
+  "req"
+  "safecopy"
+  "servant"
+  "servant-auth"
+  "servant-auth-server"
+  "servant-lucid"
+  "servant-server"
+  "split"
+  "stm"
+  "stripe-haskell"
+  "tasty"
+  "tasty-hunit"
+  "tasty-quickcheck"
+  "text"
+  "time"
+  "transformers"
+  "unagi-chan"
+  "unix"
+  "unordered-containers"
+  "uuid"
+  "vector"
+  "wai"
+  "wai-app-static"
+  "wai-extra"
+  "wai-middleware-metrics"
+  "warp"
+  "x509"
 ]
-- 
cgit v1.2.3