Skip to content

Commit ca7d096

Browse files
committed
Simpify module logic
1 parent 691dd53 commit ca7d096

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

flake.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
allow-newer: size-based:template-haskell
127127
'';
128128

129-
haskellModule = system:
130-
let pkgs = nixpkgsFor system; in
129+
haskellModules = [(
130+
{ pkgs, ... }:
131131
{
132132
packages = {
133133
marlowe.flags.defer-plugin-errors = true;
@@ -143,7 +143,8 @@
143143
pkgs.buildPackages.buildPackages.gitMinimal
144144
];
145145
};
146-
};
146+
}
147+
)];
147148

148149
extraSources = [
149150
{
@@ -329,11 +330,11 @@
329330
exactDeps = true;
330331
nativeBuildInputs = [ pkgs'.cabal-install pkgs'.hlint pkgs'.haskellPackages.fourmolu pkgs'.jq pkgs'.websocat ];
331332
};
332-
modules = [(haskellModule system)];
333+
modules = haskellModules;
333334
};
334335

335336
in {
336-
inherit cabalProjectLocal extraSources haskellModule;
337+
inherit cabalProjectLocal extraSources haskellModules;
337338

338339
project = perSystem projectFor;
339340
flake = perSystem (system: (projectFor system).flake { });

0 commit comments

Comments
 (0)