Skip to content

Commit 456a0eb

Browse files
authored
Remove an allow-newer (#3989)
* Remove an allow-newer * Cut down the nix workflow more
1 parent 98efc37 commit 456a0eb

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

.github/workflows/nix.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ jobs:
5858
with:
5959
name: haskell-language-server
6060
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
61+
# Don't try and run the build (although that would be a good
62+
# test), it takes a long time and we have sometimes had
63+
# glibc incompatibilities with the runners
6164
- run: |
62-
nix develop --print-build-logs --command cabal update
63-
nix develop --print-build-logs --command cabal build
65+
nix develop --print-build-logs --command true
6466
6567
nix_post_job:
6668
if: always()

cabal.project

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ packages:
3636
./plugins/hls-overloaded-record-dot-plugin
3737
./plugins/hls-semantic-tokens-plugin
3838

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

4141
tests: True
4242
test-show-details: direct
@@ -89,10 +89,10 @@ if impl(ghc >= 9.1)
8989
ekg-core:ghc-prim
9090

9191
if impl(ghc >= 9.7)
92+
-- ekg packagess are old and unmaintained, but we
93+
-- don't rely on them for the mainline build, so
94+
-- this is okay
9295
allow-newer:
9396
ekg-core:text,
9497
-- https://github.com/haskell-primitive/primitive-unlifted/issues/39
9598
primitive-unlifted:bytestring,
96-
-- https://github.com/obsidiansystems/commutative-semigroups/issues/13
97-
commutative-semigroups:base,
98-
commutative-semigroups:template-haskell,

flake.lock

Lines changed: 9 additions & 9 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
shell-ghc92 = mkDevShell pkgs.haskell.packages.ghc92;
101101
shell-ghc94 = mkDevShell pkgs.haskell.packages.ghc94;
102102
shell-ghc96 = mkDevShell pkgs.haskell.packages.ghc96;
103+
shell-ghc98 = mkDevShell pkgs.haskell.packages.ghc98;
103104
};
104105

105106
packages = {

0 commit comments

Comments
 (0)