Skip to content

Fix Nix builds #3724

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 1 commit into from
Jul 20, 2023
Merged

Fix Nix builds #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .github/workflows/nix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ jobs:
# We only build nix dev shell for current GHC version because some are
# failing with different GHC version on darwin.
- name: Build development shell with nix dependencies for current GHC version
if: matrix.os == 'macOS-latest'
run: nix develop --print-build-logs .#haskell-language-server-dev-nix --profile dev
- name: Build development shells with nix dependencies
if: matrix.os == 'ubuntu-latest'
run: nix develop --print-build-logs .#all-nix-dev-shells --profile dev
- name: Push development shell
if: ${{ env.HAS_TOKEN == 'true' }}
Expand Down
8 changes: 2 additions & 6 deletions configuration-ghc-90.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@ let
doCheck = false;
});
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
# 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 { };

Cabal = hself.Cabal_3_6_3_0;

Cabal-syntax = hself.Cabal-syntax_3_8_1_0;

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

lsp = hself.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
Expand All @@ -42,7 +38,7 @@ let

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

fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
fourmolu = hsuper.fourmolu_0_10_1_0;

# Re-generate HLS drv excluding some plugins
haskell-language-server =
Expand Down
12 changes: 4 additions & 8 deletions configuration-ghc-92.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,25 @@ let
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
apply-refact = hsuper.apply-refact_0_13_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 { };

Cabal-syntax = hself.Cabal-syntax_3_8_1_0;

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

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

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

fourmolu = hself.callHackage "fourmolu" "0.10.1.0" {};
fourmolu = hsuper.fourmolu_0_10_1_0;

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

hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };

implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };

lsp = hself.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});

# Re-generate HLS drv excluding some plugins
haskell-language-server =
Expand Down
4 changes: 3 additions & 1 deletion configuration-ghc-94.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ let
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) {
apply-refact = hsuper.apply-refact_0_13_0_0;

fourmolu = dontCheck (hself.callCabal2nix "fourmolu" inputs.fourmolu-011 {});

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

lsp = hself.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});

# Re-generate HLS drv excluding some plugins
haskell-language-server =
Expand Down
28 changes: 9 additions & 19 deletions configuration-ghc-96.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,24 @@ let
doCheck = false;
});
apply-refact = hsuper.apply-refact_0_13_0_0;
tagged = hself.callHackage "tagged" "0.8.7" { };
primitive = hself.callHackage "primitive" "0.8.0.0" { };
unix-compat = hself.callCabal2nix "unix-compat" inputs.haskell-unix-compat { };
MonadRandom = hself.callHackage "MonadRandom" "0.6" { };
hiedb = hself.callCabal2nix "hiedb" inputs.haskell-hiedb { };
tagged = hsuper.tagged_0_8_7;
primitive = hsuper.primitive_0_8_0_0;
MonadRandom = hsuper.MonadRandom_0_6;
hie-bios = hself.callCabal2nix "hie-bios" inputs.haskell-hie-bios { };
hlint = hself.callCabal2nix "hlint" inputs.hlint-36 {};
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.haskell-ghc-exactprint { };

# 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 { };
fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-012 {};

ormolu = hself.ormolu_0_5_3_0;
ghc-lib-parser-ex = hsuper.ghc-lib-parser-ex_9_6_0_0;

# TODO: smunix: nix fails to build fourmolu-0.13 from Hackage with these errors:
# tar: */fourmolu/0.13.0.0/fourmolu.json: Not found in archive
# tar: */fourmolu/0.13.0.0/fourmolu.cabal: Not found in archive
# tar: Exiting with failure status due to previous errors
# As an alternative, we could build directly from github:fourmolu. How do people
# feel about this?
fourmolu = hself.callHackage "fourmolu" "0.12.0.0" {};
ormolu = hself.callCabal2nix "ormolu" inputs.ormolu-07 {};

stylish-haskell = appendConfigureFlag hsuper.stylish-haskell "-fghc-lib";
stylish-haskell = hself.callCabal2nix "stylish-haskell" inputs.stylish-haskell-0145 {};

lsp = hself.callCabal2nix "lsp" inputs.lsp {};
lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
lsp-test = dontCheck (hself.callCabal2nix "lsp-test" inputs.lsp-test {});

# Re-generate HLS drv excluding some plugins
haskell-language-server =
Expand Down
105 changes: 39 additions & 66 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading