diff options
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/default.nix b/default.nix index 41a1f0b..753483d 100644 --- a/default.nix +++ b/default.nix @@ -4,9 +4,8 @@ let nixos = import "${nixpkgs-tar}/nixos"; # TODO(bsima): buildNixOS should be split into multiple functions that each # return one thing, instead of a single function that returns multiple things + biz = import ./biz.nix { inherit nixpkgs; }; buildOS = import ./Com/Simatime/buildOS.nix nixos; - buildGhc = import ./Com/Simatime/buildGhc.nix nixpkgs; - buildGhcjs = import ./Com/Simatime/buildGhcjs.nix nixpkgs; nixos-mailserver = let ver = "v2.3.0"; in builtins.fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${ver}/nixos-mailserver-${ver}.tar.gz"; sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919"; @@ -72,10 +71,10 @@ in rec { }; # Haskell targets # - Com.InfluencedByBooks.Server = buildGhc Com/InfluencedByBooks/Server.hs; - Com.InfluencedByBooks.Client = buildGhcjs Com/InfluencedByBooks/Client.hs; - Com.MusicMeetsComics.Server = buildGhc Com/MusicMeetsComics/Server.hs; - Com.MusicMeetsComics.Client = buildGhcjs Com/MusicMeetsComics/Client.hs; - Run.Que.Server = buildGhc ./Run/Que/Server.hs; - Run.Que.Website = buildGhc ./Run/Que/Website.hs; + Com.InfluencedByBooks.Server = biz.buildGhc Com/InfluencedByBooks/Server.hs; + Com.InfluencedByBooks.Client = biz.buildGhcjs Com/InfluencedByBooks/Client.hs; + Com.MusicMeetsComics.Server = biz.buildGhc Com/MusicMeetsComics/Server.hs; + Com.MusicMeetsComics.Client = biz.buildGhcjs Com/MusicMeetsComics/Client.hs; + Run.Que.Server = biz.buildGhc ./Run/Que/Server.hs; + Run.Que.Website = biz.buildGhc ./Run/Que/Website.hs; } |