Merge Ava deployment changes

3 files changed, 6 insertions, 2 deletions

diff --git a/Omni/Bild/Builder.nix b/Omni/Bild/Builder.nix
index 9ede3b8..9356d97 100644
--- a/Omni/Bild/Builder.nix
+++ b/Omni/Bild/Builder.nix
@@ -280,8 +280,7 @@ with bild; let
 
       python = python.buildPythonApplication rec {
         inherit name src CODEROOT;
-        pyproject = true;
-        build-system = [python.packages.setuptools];
+        format = "setuptools";
         nativeBuildInputs = [makeWrapper];
         propagatedBuildInputs = langdeps_ ++ sysdeps_ ++ rundeps_;
         buildInputs = sysdeps_;
diff --git a/Omni/Bild/Deps/Haskell.nix b/Omni/Bild/Deps/Haskell.nix
index 7e3650a..138a80e 100644
--- a/Omni/Bild/Deps/Haskell.nix
+++ b/Omni/Bild/Deps/Haskell.nix
@@ -22,6 +22,8 @@
   "fast-logger"
   "filepath"
   "github"
+  "HaskellNet"
+  "HaskellNet-SSL"
   "haskeline"
   "hostname"
   "http-types"
@@ -53,6 +55,7 @@
   "sqids"
   "sqlite-simple"
   "stm"
+  "tagsoup"
   "tasty"
   "tasty-hunit"
   "tasty-quickcheck"
diff --git a/Omni/Bild/Haskell.nix b/Omni/Bild/Haskell.nix
index e55dee9..5754253 100644
--- a/Omni/Bild/Haskell.nix
+++ b/Omni/Bild/Haskell.nix
@@ -21,6 +21,8 @@ in rec {
                     cmark = doJailbreak sup.cmark;
                     docopt = buildCabal sel "docopt";
                     filelock = dontCheck sup.filelock;
+                    HaskellNet = doJailbreak sup.HaskellNet;
+                    HaskellNet-SSL = doJailbreak sup.HaskellNet-SSL;
                     linear-generics = doJailbreak sup.linear-generics;
                     req = doJailbreak sup.req;
                     servant-auth = doJailbreak sup.servant-auth;