diff --git a/flake.nix b/flake.nix index 11a44d3c1b59b6505cc8363c0acfde7329f79cd4..b1b1e6821bd54338aabc7f2a5db91d966f8608b3 100644 --- a/flake.nix +++ b/flake.nix @@ -13,17 +13,16 @@ let pkgs = import nixpkgs { inherit system; }; horizon-gen-nix-app = get-flake horizon-gen-nix; - configuration = import ./configuration.nix { inherit inputs pkgs; }; haskellLib = pkgs.haskell.lib.compose; hsPkgs = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) { buildHaskellPackages = pkgs.haskell.packages.ghc942; + compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { inherit haskellLib; }; configurationCommon = import ./configuration.nix; configurationNix = { pkgs, haskellLib }: self: super: { }; ghc = pkgs.haskell.compiler.ghc942; - haskellLib = pkgs.haskell.lib.compose; + inherit haskellLib; initialPackages = import ./overlay.nix; nonHackagePackages = self: super: { }; - compilerConfig = pkgs.callPackage ./configuration-ghc-9.4.x.nix { haskellLib = haskellLib; }; }; hp' = pkgs.lib.filterAttrs (n: v: v != null