Skip to content

Commit ac5cb65

Browse files
Update haskell.nix and CHaP.
The arguments to shellFor have changed. Update hls to 2.11.0.0.
1 parent 42daa3b commit ac5cb65

File tree

4 files changed

+56
-37
lines changed

4 files changed

+56
-37
lines changed

cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ repository cardano-haskell-packages
1212

1313
-- See CONTRIBUTING.md for information about when and how to update these.
1414
index-state:
15-
, hackage.haskell.org 2025-05-27T12:29:12Z
16-
, cardano-haskell-packages 2025-05-28T12:02:33Z
15+
, hackage.haskell.org 2025-06-11T21:55:55Z
16+
, cardano-haskell-packages 2025-06-12T11:07:25Z
1717

1818
packages: **/*.cabal
1919

flake.lock

Lines changed: 41 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
inherit (inputs.aiken.packages.${system}) aiken;
6464
apply-refact = final.haskell-nix.tool compiler "apply-refact" "0.15.0.0";
6565
cabal-install = final.haskell-nix.tool compiler "cabal-install" "3.10.3.0";
66-
cabal-plan = final.haskell-nix.tool compiler "cabal-plan" "0.7.5.0";
66+
cabal-plan = final.haskell-nix.tool compiler "cabal-plan" { version = "0.7.5.0"; cabalProjectLocal = "package cabal-plan\nflags: +exe"; };
6767
cabal-fmt = config.treefmt.programs.cabal-fmt.package;
6868
fourmolu = config.treefmt.programs.fourmolu.package;
69-
haskell-language-server = final.haskell-nix.tool compiler "haskell-language-server" "2.9.0.0";
69+
haskell-language-server = final.haskell-nix.tool compiler "haskell-language-server" "2.11.0.0";
7070
weeder = final.haskell-nix.tool compiler "weeder" "2.9.0";
7171
inherit (inputs.cardano-node.packages.${system}) cardano-cli;
7272
inherit (inputs.cardano-node.packages.${system}) cardano-node;

nix/hydra/shell.nix

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,12 @@ let
6565
pkgs.systemd
6666
];
6767

68-
haskellNixShell = hsPkgs.shellFor {
68+
haskellNixShell = (hsPkgs.shellFor {
6969
buildInputs = libs ++ buildInputs;
7070

7171
withHoogle = true;
7272

7373
# Always create missing golden files
74-
CREATE_MISSING_GOLDEN = 1;
75-
76-
# Force a UTF-8 locale because many Haskell programs and tests
77-
# assume this.
78-
LANG = "en_US.UTF-8";
79-
80-
GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
81-
8274
shellHook = ''
8375
if ! which cardano-node > /dev/null 2>&1; then
8476
echo "WARNING: 'cardano-node' not found"
@@ -87,6 +79,16 @@ let
8779
echo "WARNING: 'cardano-cli' not found"
8880
fi
8981
'';
82+
}).overrideAttrs {
83+
84+
CREATE_MISSING_GOLDEN = 1;
85+
86+
# Force a UTF-8 locale because many Haskell programs and tests
87+
# assume this.
88+
LANG = "en_US.UTF-8";
89+
90+
GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
91+
9092
};
9193

9294
# A "cabal-only" shell which does not use haskell.nix

0 commit comments

Comments
 (0)