Skip to content

Commit 59d8dc0

Browse files
committed
Bump dev cabal to 3.2 and use multiple subdirs feature
- The haskell.nix cabal now works, so that's nice. - We can use the nice multiple-subdirs feature in cabal.project to cut out a lot of repetition. Note we get annoying warnings about extraneous version ranges due to haskell/cabal#5119.
1 parent f6ea423 commit 59d8dc0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

nix/dev.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pkgs.recurseIntoAttrs (rec {
33
# Packages which are useful during development, but we don't depend upon directly to build our stuff
44
packages = pkgs.recurseIntoAttrs {
55
# See comment on the definition about it not working
6-
#cabal-install = haskell.extraPackages.cabal-install.components.exes.cabal;
6+
cabal-install = haskell.extraPackages.cabal-install.components.exes.cabal;
77
stylish-haskell = haskell.extraPackages.stylish-haskell.components.exes.stylish-haskell;
88
hlint = haskell.extraPackages.hlint.components.exes.hlint;
99
haskell-language-server = haskell.extraPackages.haskell-language-server.components.exes.haskell-language-server;

nix/haskell-extra.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
############################################################################
77
{ pkgs, index-state, checkMaterialization }:
88
{
9-
# FIXME: this cabal can't be used for development purposes until
10-
# https://github.com/input-output-hk/haskell.nix/issues/422 is fixed
11-
# Also need to pick a version that builds properly
129
cabal-install = pkgs.haskell-nix.hackage-package {
1310
name = "cabal-install";
14-
version = "3.0.0.0";
11+
version = "3.2.0.0";
1512
inherit index-state checkMaterialization;
1613
# Invalidate and update if you change the version or index-state
17-
plan-sha256 = "08zkccwygm4g83chyiwbskkjfclm22vmhbx2s2rh0lvjkclqy6qc";
14+
plan-sha256 = "1pah0hdljyppj51dwa0s8yjmi9dv75xqsk6fghlsz7a3r0dchcss";
1815
};
1916
stylish-haskell = pkgs.haskell-nix.hackage-package {
2017
name = "stylish-haskell";

0 commit comments

Comments
 (0)