Skip to content

Commit 2cbd7f2

Browse files
committed
build(nix): Remove some ghc-8.10 hacks
1 parent 3c67b35 commit 2cbd7f2

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

flake.nix

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@
183183
# for the target.
184184
shell.buildInputs = with nixpkgs.pkgsBuildBuild; [
185185
gitAndTools.git
186-
hlint
187186
];
188187
shell.withHoogle = true;
189188
shell.crossPlatforms = _: [];
@@ -211,32 +210,13 @@
211210

212211
})
213212

214-
({ lib, config, ... }:
215-
# Disable haddock on 8.x
216-
lib.mkIf (lib.versionOlder config.compiler.version "9") {
217-
packages.cardano-ledger-alonzo.doHaddock = false;
218-
packages.cardano-ledger-allegra.doHaddock = false;
219-
packages.cardano-ledger-api.doHaddock = false;
220-
packages.cardano-ledger-babbage.doHaddock = false;
221-
packages.cardano-ledger-conway.doHaddock = false;
222-
packages.cardano-ledger-shelley.doHaddock = false;
223-
packages.cardano-protocol-tpraos.doHaddock = false;
224-
packages.fs-api.doHaddock = false;
225-
packages.ouroboros-network-framework.doHaddock = false;
226-
packages.ouroboros-consensus-cardano.doHaddock = false;
227-
packages.ouroboros-consensus.doHaddock = false;
228-
packages.cardano-ledger-core.doHaddock = false;
229-
packages.plutus-ledger-api.doHaddock = false;
230-
packages.wai-extra.doHaddock = false;
231-
})
232213

233-
({ lib, pkgs, config, ... }:
234-
lib.mkIf (lib.versionAtLeast config.compiler.version "9.4") {
235-
# lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
236-
# to call out to all kinds of silly tools that GHC doesn't really provide.
237-
# For this reason, we try to get away without re-installing lib:ghc for now.
238-
reinstallableLibGhc = false;
239-
})
214+
({ lib, pkgs, config, ... }: {
215+
# lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
216+
# to call out to all kinds of silly tools that GHC doesn't really provide.
217+
# For this reason, we try to get away without re-installing lib:ghc for now.
218+
reinstallableLibGhc = false;
219+
})
240220

241221
({ pkgs, ... }:
242222
# Database tests

0 commit comments

Comments
 (0)