Skip to content

Commit

Permalink
Remove an allow-newer (haskell#3989)
Browse files Browse the repository at this point in the history
* Remove an allow-newer

* Cut down the nix workflow more
  • Loading branch information
michaelpj authored Jan 20, 2024
1 parent 98efc37 commit 456a0eb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ jobs:
with:
name: haskell-language-server
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
# Don't try and run the build (although that would be a good
# test), it takes a long time and we have sometimes had
# glibc incompatibilities with the runners
- run: |
nix develop --print-build-logs --command cabal update
nix develop --print-build-logs --command cabal build
nix develop --print-build-logs --command true
nix_post_job:
if: always()
Expand Down
8 changes: 4 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ packages:
./plugins/hls-overloaded-record-dot-plugin
./plugins/hls-semantic-tokens-plugin

index-state: 2024-01-17T16:04:21Z
index-state: 2024-01-19T00:00:00Z

tests: True
test-show-details: direct
Expand Down Expand Up @@ -89,10 +89,10 @@ if impl(ghc >= 9.1)
ekg-core:ghc-prim

if impl(ghc >= 9.7)
-- ekg packagess are old and unmaintained, but we
-- don't rely on them for the mainline build, so
-- this is okay
allow-newer:
ekg-core:text,
-- https://github.com/haskell-primitive/primitive-unlifted/issues/39
primitive-unlifted:bytestring,
-- https://github.com/obsidiansystems/commutative-semigroups/issues/13
commutative-semigroups:base,
commutative-semigroups:template-haskell,
18 changes: 9 additions & 9 deletions flake.lock

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

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
shell-ghc92 = mkDevShell pkgs.haskell.packages.ghc92;
shell-ghc94 = mkDevShell pkgs.haskell.packages.ghc94;
shell-ghc96 = mkDevShell pkgs.haskell.packages.ghc96;
shell-ghc98 = mkDevShell pkgs.haskell.packages.ghc98;
};

packages = {
Expand Down

0 comments on commit 456a0eb

Please sign in to comment.