Skip to content

Update flake to GHC 9.2.6 and 9.4.4 #3503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 24, 2023
Merged

Update flake to GHC 9.2.6 and 9.4.4 #3503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72dc5a1
configuration-ghc-94.nix: Don't yolo anymore since packages work now
lf- Nov 30, 2022
d5dbec8
Stop doing an extremely slow fetch of all-cabal-hashes
lf- Nov 30, 2022
3a2a83b
Export an overlay that does not override the package set
lf- Dec 2, 2022
292f459
At least it works in nix on 9.4
lf- Dec 2, 2022
63c09e3
Allow ormolu-0.5.3
cydparser Feb 23, 2023
4f381db
Update flake to GHC 9.2.6 and 9.4.4
cydparser Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions configuration-ghc-90.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,32 @@ let
# https://github.com/nikita-volkov/ptr-poker/issues/11
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };

ghc-lib = hself.ghc-lib_9_2_5_20221107;
ghc-lib-parser = hself.ghc-lib-parser_9_2_5_20221107;
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_1_1;

Cabal = hself.Cabal_3_6_3_0;
ormolu = hself.ormolu_0_5_0_1;
fourmolu = hself.fourmolu_0_9_0_0;
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-341 {}) "-fghc-lib";

Cabal-syntax = hself.Cabal-syntax_3_8_1_0;

ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};

hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";

hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
./plugins/hls-hlint-plugin
(pkgs.lib.concatStringsSep " " [ "-fhlint34" "-fghc-lib" ]) { };

OneTuple = overrideCabal hsuper.OneTuple (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
hself.base-orphans
];
});

ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};

# Re-generate HLS drv excluding some plugins
haskell-language-server =
hself.callCabal2nixWithOptions "haskell-language-server" ./.
(pkgs.lib.concatStringsSep " " [ "-f-stylishhaskell" ])
{ };

retrie = hself.retrie_1_1_0_0;
apply-refact = hself.apply-refact_0_9_3_0;

});
in {
inherit disabledPlugins;
Expand Down
13 changes: 9 additions & 4 deletions configuration-ghc-92.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@ let
doCheck = false;
});
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
apply-refact = hsuper.apply-refact_0_12_0_0;

# ptr-poker breaks on MacOS without SSE2 optimizations
# https://github.com/nikita-volkov/ptr-poker/issues/11
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };

ghc-exactprint =
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
fourmolu = hself.fourmolu_0_9_0_0;
hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-341 {}) "-fghc-lib";
Cabal-syntax = hself.Cabal-syntax_3_8_1_0;

ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};

hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";

ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-052 {};

stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";

Expand Down
17 changes: 6 additions & 11 deletions configuration-ghc-94.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,23 @@ let
with pkgs.haskell.lib;
{
hlsDisabledPlugins = disabledPlugins;
# YOLO
mkDerivation = args:
hsuper.mkDerivation (args // {
jailbreak = true;
doCheck = false;
});
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
apply-refact = hsuper.apply-refact_0_12_0_0;

# ptr-poker breaks on MacOS without SSE2 optimizations
# https://github.com/nikita-volkov/ptr-poker/issues/11
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };

ghc-exactprint =
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-160 { };
hlint = hsuper.callCabal2nix "hlint" inputs.hlint-35 {};
ormolu = hself.ormolu_0_5_3_0;

stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";

# Re-generate HLS drv excluding some plugins
haskell-language-server =
hself.callCabal2nixWithOptions "haskell-language-server" ./.
(pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { };

# Pedantic cannot be used due to -Werror=unused-top-binds
# Check must be disabled due to some missing required files
(pkgs.lib.concatStringsSep " " [ "--no-check" "-f-pedantic" "-f-hlint" ]) { };
});
in {
inherit disabledPlugins;
Expand Down
Loading