Skip to content

Commit dfea4c3

Browse files
committed
try fix
1 parent c1550ac commit dfea4c3

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

configuration-ghc-94.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ let
1515
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
1616
apply-refact = hsuper.apply-refact_0_12_0_0;
1717

18-
# ptr-poker breaks on MacOS without SSE2 optimizations
19-
# https://github.com/nikita-volkov/ptr-poker/issues/11
20-
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
21-
22-
ormolu = hself.ormolu_0_5_3_0;
23-
2418
stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
2519

2620
# Re-generate HLS drv excluding some plugins

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@
121121
then overrideCabal hsuper.ormolu (_: { enableSeparateBinOutput = false; })
122122
else hsuper.ormolu;
123123

124-
# Due to the following issue, fixity-th should be disabled, especially for darwin.
125-
# https://github.com/fourmolu/fourmolu/issues/238
126-
# nixpkgs now disables fixity-th for ghc944.
127-
fourmolu =
128-
addBuildDepend
129-
(appendConfigureFlag hself.fourmolu_0_10_1_0 "-f-fixity-th")
130-
hself.file-embed;
131-
132124
stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell {};
133125
};
134126

@@ -241,7 +233,7 @@
241233
# our compiling toolchain
242234
hpkgs.ghc
243235
# @guibou: I'm not sure hie-bios is needed
244-
pkgs.haskellPackages.hie-bios
236+
# pkgs.haskellPackages.hie-bios
245237
# Dependencies needed to build some parts of hackage
246238
gmp zlib ncurses
247239
# Changelog tooling

0 commit comments

Comments
 (0)