From 340026c05eee73e7811b0f20044ac61799545e4a Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Wed, 9 Nov 2022 16:38:26 +0000
Subject: [PATCH] clean up arguments to callPackage
---
flake.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/flake.nix b/flake.nix
index 11a44d3c..b1b1e682 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
--
GitLab