diff --git a/default.nix b/default.nix index 3d7da99..971000a 100644 --- a/default.nix +++ b/default.nix @@ -5,13 +5,17 @@ let { niv = import sources.niv {}; # use the sources :) }; - # Import the Haskell.nix library, - #pkgs = import (import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz)); - pkgs = import sources.nixpkgs ( + pkgs1 = import sources.nixpkgs { overlays = [ overlay ]; config = {}; - import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) - ); + #import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz) + }; + # Import the Haskell.nix library, + pkgs2 = import + (import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz)) + ; + + pkgs = pkgs1 // pkgs2; # Import the file you will create in the stack-to-nix or cabal-to-nix step. my-pkgs = import ./pkgs.nix; @@ -31,4 +35,5 @@ let ]; }; -in pkgSet.config.hsPkgs // { _config = pkgSet.config; } +in pkgSet.config.hsPkgs // + { _config = pkgSet.config; }