From e5a6175e044d69b8f598a2c2acb9bcfd77b9001c Mon Sep 17 00:00:00 2001 From: Ben Sima 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/Dev/Configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Biz/Dev') diff --git a/Biz/Dev/Configuration.nix b/Biz/Dev/Configuration.nix index bcf184d..7fdefa4 100644 --- a/Biz/Dev/Configuration.nix +++ b/Biz/Dev/Configuration.nix @@ -63,7 +63,7 @@ in { services.my-hoogle.enable = true; services.my-hoogle.port = ports.hoogle; services.my-hoogle.home = "//hoogle.simatime.com"; - services.my-hoogle.packages = import ../Bild/Deps/Haskell.nix; + services.my-hoogle.packages = pkgset: lib.attrsets.attrVals (import ../Bild/Deps/Haskell.nix) pkgset; services.my-hoogle.haskellPackages = pkgs.haskell.packages.${ghcCompiler}; services.my-hoogle.host = "0.0.0.0"; -- cgit v1.2.3