diff options
Diffstat (limited to 'Biz/Bild.nix')
| -rw-r--r-- | Biz/Bild.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Biz/Bild.nix b/Biz/Bild.nix index c007661..e675b68 100644 --- a/Biz/Bild.nix +++ b/Biz/Bild.nix @@ -1,8 +1,7 @@ { nixpkgs ? import ./Bild/Nixpkgs.nix }: -with import ./Bild/Constants.nix; - rec { + constants = import ./Bild/Constants.nix; private = { inherit nixpkgs; @@ -21,7 +20,7 @@ rec { haskellDeps = import ./Bild/Deps/Haskell.nix; - ghcWith = nixpkgs.haskell.packages.${ghcCompiler}.ghcWithHoogle; + ghcWith = nixpkgs.haskell.packages.${constants.ghcCompiler}.ghcWithHoogle; #mkGhcjsPackageSet = nixpkgs.haskell.packages.${ghcjsCompiler}.ghcWithPackages; ghcPackageSetFull = private.ghcWith private.haskellDeps; @@ -140,20 +139,20 @@ rec { env = nixpkgs.pkgs.mkShell { name = "bizdev"; + # this should just be dev tools buildInputs = with nixpkgs.pkgs; [ - # this should just be dev tools - haskell.packages.${ghcCompiler}.apply-refact + #haskell.packages.${constants.ghcCompiler}.apply-refact bild figlet git - haskell.packages.${ghcCompiler}.fast-tags + haskell.packages.${constants.ghcCompiler}.fast-tags hlint lolcat - niv.niv nixops ormolu - python38Packages.black - python38Packages.pylint + # not using python now, should remove + #python38Packages.black + #python38Packages.pylint rustc sbcl lispPackages.swank |