diff options
Diffstat (limited to 'Biz/Bild/Rules.nix')
-rw-r--r-- | Biz/Bild/Rules.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix index 2141fbf..1868313 100644 --- a/Biz/Bild/Rules.nix +++ b/Biz/Bild/Rules.nix @@ -17,7 +17,7 @@ let subset = a: b: builtins.all (x: builtins.elem x b) a; - allDeps = import ./Deps.nix; + haskellDeps = import ./Deps/Haskell.nix; # gather data needed for compiling by analyzing the main module analyze = main: rec { @@ -43,11 +43,11 @@ let }; mkGhc = compiler: (deps: compiler (hp: - if (subset deps allDeps) + if (subset deps haskellDeps) then depsToPackageSet hp deps else throw '' missing from nix/haskell-deps.nix: - ${toString (lib.lists.subtractLists allDeps deps)} + ${toString (lib.lists.subtractLists haskellDeps deps)} '')); ghc_ = mkGhc pkgs.haskell.packages.ghc865.ghcWithHoogle; @@ -104,7 +104,8 @@ in { env = mkShell { name = "bizdev"; buildInputs = [ - (ghc_ allDeps) + # haskell deps + (ghc_ haskellDeps) # ghcjs doesn't need everything, and many things fail to build (ghcjs_ [ "aeson" @@ -119,6 +120,12 @@ in { "ghcjs-base" ]) + # scheme deps + nixpkgs.guile + nixpkgs.inspekt3d + nixpkgs.libfive + + # tools nixpkgs.cmark nixpkgs.figlet nixpkgs.hlint |